Merge branch 'branches-view' into fixes/branches-view-expands-on-reload

Author: StanleyGoldman

src/GitHub.Api/Git/GitBranch.cs

@@ -2,7 +2,7 @@
 
 namespace GitHub.Unity
 {
-    interface ITreeData
+    public interface ITreeData
     {
         string Name { get; }
         bool IsActive { get; }

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -103,6 +103,7 @@
     <Compile Include="UI\LoadingView.cs" />
     <Compile Include="UI\PublishView.cs" />
     <Compile Include="UI\InitProjectView.cs" />
+    <Compile Include="UI\TreeControl.cs" />
     <Compile Include="UI\UserSettingsView.cs" />
     <Compile Include="UI\GitPathView.cs" />
     <Compile Include="UI\SettingsView.cs" />
@@ -207,6 +208,10 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="IconsAndLogos\globe%402x.png" />
+    <EmbeddedResource Include="IconsAndLogos\globe.png" />
+  </ItemGroup>
   <Import Project="..\..\..\..\..\common\nativelibraries.props" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -217,4 +222,4 @@
   </Target>
   -->
   <Import Project="..\..\..\..\..\common\build.targets" />
-</Project>
+</Project>

src/UnityExtension/Assets/Editor/GitHub.Unity/IconsAndLogos/globe.png

@@ -27,13 +27,14 @@ class Styles
                            MinCommitTreePadding = 20f,
                            FoldoutWidth = 11f,
                            FoldoutIndentation = -2f,
+                           TreePadding = 12f,
                            TreeIndentation = 12f,
                            TreeRootIndentation = -5f,
                            TreeVerticalSpacing = 3f,
                            CommitIconSize = 16f,
                            CommitIconHorizontalPadding = -5f,
                            BranchListIndentation = 20f,
-                           BranchListSeperation = 15f,
+                           BranchListSeparation = 15f,
                            RemotesTotalHorizontalMargin = 37f,
                            RemotesNameRatio = .2f,
                            RemotesUserRatio = .2f,
@@ -194,7 +195,7 @@ public static GUIStyle Label
                     label = new GUIStyle(GUI.skin.label);
                     label.name = "CustomLabel";
 
-                    var hierarchyStyle = GUI.skin.FindStyle("PR Label");
+                    GUIStyle hierarchyStyle = GUI.skin.FindStyle("PR Label");
                     label.onNormal.background = hierarchyStyle.onNormal.background;
                     label.onNormal.textColor = hierarchyStyle.onNormal.textColor;
                     label.onFocused.background = hierarchyStyle.onFocused.background;
@@ -829,5 +830,79 @@ public static Texture2D DropdownListIcon
                 return dropdownListIcon;
             }
         }
+
+        private static Texture2D rootFolderIcon;
+        public static Texture2D RootFolderIcon
+        {
+            get
+            {
+                if (rootFolderIcon == null)
+                {
+                    rootFolderIcon = Utility.GetIcon("globe.png", "[email protected]");
+                }
+                return rootFolderIcon;
+            }
+        }
+
+        private static GUIStyle foldout;
+        public static GUIStyle Foldout
+        {
+            get
+            {
+                if (foldout == null)
+                {
+                    foldout = new GUIStyle(EditorStyles.foldout);
+                    foldout.name = "CustomFoldout";
+
+                    foldout.focused.textColor = Color.white;
+                    foldout.onFocused.textColor = Color.white;
+                    foldout.focused.background = foldout.active.background;
+                    foldout.onFocused.background = foldout.onActive.background;
+                }
+
+                return foldout;
+            }
+        }
+
+        private static GUIStyle treeNode;
+        public static GUIStyle TreeNode
+        {
+            get
+            {
+                if (treeNode == null)
+                {
+                    treeNode = new GUIStyle(GUI.skin.label);
+                    treeNode.name = "Custom TreeNode";
+
+                    var color = new Color(62f / 255f, 125f / 255f, 231f / 255f);
+                    var texture = Utility.GetTextureFromColor(color);
+                    treeNode.focused.background = texture;
+                    treeNode.onFocused.background = texture;
+                    treeNode.focused.textColor = Color.white;
+                    treeNode.onFocused.textColor = Color.white;
+                }
+
+                return treeNode;
+            }
+        }
+
+        private static GUIStyle treeNodeActive;
+        public static GUIStyle TreeNodeActive
+        {
+            get
+            {
+                if (treeNodeActive == null)
+                {
+                    treeNodeActive = new GUIStyle(TreeNode);
+                    treeNodeActive.name = "Custom TreeNode Active";
+                    treeNodeActive.fontStyle = FontStyle.Bold;
+                    treeNodeActive.focused.textColor = Color.white;
+                    treeNodeActive.active.textColor = Color.white;
+                }
+
+                return treeNodeActive;
+            }
+        }
+
     }
 }

src/UnityExtension/Assets/Editor/GitHub.Unity/IconsAndLogos/[email protected]

@@ -7,6 +7,40 @@
 
 namespace GitHub.Unity
 {
+    [Serializable]
+    public class SerializableTexture2D
+    {
+        [SerializeField] private byte[] bytes;
+        [SerializeField] private int height;
+        [SerializeField] private int width;
+        [SerializeField] private TextureFormat format;
+        [SerializeField] private bool mipmap;
+        [SerializeField] private Texture2D texture;
+
+        public Texture2D Texture
+        {
+            get
+            {
+                if (texture == null)
+                {
+                    texture = new Texture2D(width, height, format, mipmap);
+                    texture.LoadRawTextureData(bytes);
+                    texture.Apply();
+                }
+                return texture;
+            }
+            set
+            {
+                texture = value;
+                bytes = value.GetRawTextureData();
+                height = value.height;
+                width = value.width;
+                format = value.format;
+                mipmap = value.mipmapCount > 1;
+            }
+        }
+    }
+
     class Utility : ScriptableObject
     {
         public static Texture2D GetIcon(string filename, string filename2x = "")
@@ -23,6 +57,18 @@ public static Texture2D GetIcon(string filename, string filename2x = "")
             var iconPath = EntryPoint.Environment.ExtensionInstallPath.Combine("IconsAndLogos", filename).ToString(SlashMode.Forward);
             return AssetDatabase.LoadAssetAtPath<Texture2D>(iconPath);
         }
+
+        public static Texture2D GetTextureFromColor(Color color)
+        {
+            Color[] pix = new Color[1];
+            pix[0] = color;
+
+            Texture2D result = new Texture2D(1, 1);
+            result.SetPixels(pix);
+            result.Apply();
+
+            return result;
+        }
     }
 
     static class StreamExtensions

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -1,5 +1,4 @@
 using System;
-using GitHub.Unity;
 
 namespace GitHub.Unity
 {