Forward-port donokuda/changes-polish

commit ea83090309637da404a38e27a8411bfc8fa82762
Add folder icon to the top

commit 73337ae5b5413df32577ea41c8ec73eedd2171ce
Make the text gray and strikethrough if deleted

commit 4290c09950e615867dd411a466b3f0656811ef22
Put a strike through the label of deleted files

commit d074887b9ea13bc1628a19750c5741cf72224aaa
Adjust more padding and spacing

commit a7e0a2aef09c85c7bec138d8e37688c821afa2ed
Add a little padding and margins in and around the commits area.

commit de5ed80f49f39d98fefbdf1169f06e4ea104431f
Add icon for untracked files

commit ca87c8941e8243d6fc320a35783d48053c4dd8e7
Adjust spacing in file tree

commit a52813e9f1b83c4d5850cca007032087e604d3b5
Render git icons on the file icon

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

@@ -24,12 +24,14 @@ namespace GitHub.Unity
             HistoryChangesIndentation = 8f,
             CommitAreaMinHeight = 16f,
             CommitAreaDefaultRatio = .4f,
-            CommitAreaMaxHeight = 10 * 15f,
+            CommitAreaMaxHeight = 12 * 15f,
+            CommitAreaPadding = 5f,
             MinCommitTreePadding = 20f,
             FoldoutWidth = 11f,
             FoldoutIndentation = -2f,
             TreeIndentation = 17f,
             TreeRootIndentation = -5f,
+            TreeVerticalSpacing = 3f,
             CommitIconSize = 16f,
             CommitIconHorizontalPadding = -5f,
             BranchListIndentation = 20f,
@@ -45,6 +47,9 @@ namespace GitHub.Unity
             GitIgnoreRulesFileRatio = .3f,
             GitIgnoreRulesLineRatio = .5f;
 
+        public const int
+            HalfSpacing = (int)(BaseSpacing / 2);
+
 
         const string
             BrowseButton = "...",
@@ -54,6 +59,7 @@ namespace GitHub.Unity
         static GUIStyle
             label,
             boldLabel,
+            deletedFileLabel,
             longMessageStyle,
             historyToolbarButtonStyle,
             historyLockStyle,
@@ -61,6 +67,7 @@ namespace GitHub.Unity
             historyEntryDetailsRightStyle,
             commitFileAreaStyle,
             commitButtonStyle,
+            textFieldStyle,
             commitDescriptionFieldStyle,
             toggleMixedStyle;
         static Texture2D
@@ -68,6 +75,7 @@ namespace GitHub.Unity
             addedStatusIcon,
             deletedStatusIcon,
             renamedStatusIcon,
+            untrackedStatusIcon,
             activeBranchIcon,
             trackingBranchIcon,
             favouriteIconOn,
@@ -118,6 +126,21 @@ namespace GitHub.Unity
             }
         }
 
+		public static GUIStyle DeletedFileLabel
+		{
+			get
+			{
+				if (deletedFileLabel == null)
+				{
+					deletedFileLabel = new GUIStyle(EditorStyles.label);
+					deletedFileLabel.name = "DeletedFileLabel";
+					deletedFileLabel.normal.textColor = Color.gray;
+				}
+
+				return deletedFileLabel;
+			}
+		}
+
 
         public static GUIStyle LongMessageStyle
         {
@@ -241,6 +264,21 @@ namespace GitHub.Unity
             }
         }
 
+		public static GUIStyle TextFieldStyle
+		{
+			get
+			{
+				if (textFieldStyle == null)
+				{
+					textFieldStyle = new GUIStyle(GUI.skin.textField);
+					textFieldStyle.name = "TextFieldStyle";
+					textFieldStyle.fixedHeight = 21;
+					textFieldStyle.padding = new RectOffset(HalfSpacing, HalfSpacing, 4, 0);
+				}
+
+				return textFieldStyle;
+			}
+		}
 
         public static GUIStyle CommitDescriptionFieldStyle
         {
@@ -250,6 +288,7 @@ namespace GitHub.Unity
                 {
                     commitDescriptionFieldStyle = new GUIStyle(GUI.skin.textArea);
                     commitDescriptionFieldStyle.name = "CommitDescriptionFieldStyle";
+                    commitDescriptionFieldStyle.padding = new RectOffset(HalfSpacing, HalfSpacing, HalfSpacing, HalfSpacing);
                     commitDescriptionFieldStyle.wordWrap = true;
                 }
 
@@ -420,6 +459,8 @@ namespace GitHub.Unity
                 return deletedStatusIcon = deletedStatusIcon ?? Utility.GetIcon("removed.png", "removed@2x.png");
                 case GitFileStatus.Renamed:
                 return renamedStatusIcon = renamedStatusIcon ?? Utility.GetIcon("renamed.png", "renamed@2x.png");
+                case GitFileStatus.Untracked:
+                return untrackedStatusIcon = untrackedStatusIcon ?? Utility.GetIcon("untracked.png", "untracked@2x.png");
                 default:
                 return null;
             }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -120,34 +120,50 @@ namespace GitHub.Unity
 
         private void OnCommitDetailsAreaGUI()
         {
-            GUILayout.BeginVertical(GUILayout.Height(
-                    Mathf.Clamp(Position.height * Styles.CommitAreaDefaultRatio,
-                    Styles.CommitAreaMinHeight,
-                    Styles.CommitAreaMaxHeight))
-            );
+            GUILayout.BeginHorizontal();
             {
-                GUILayout.Label(SummaryLabel);
-                commitMessage = GUILayout.TextField(commitMessage);
-
-                GUILayout.Label(DescriptionLabel);
-                commitBody = EditorGUILayout.TextArea(commitBody, Styles.CommitDescriptionFieldStyle, GUILayout.ExpandHeight(true));
+                GUILayout.Space(Styles.CommitAreaPadding);
 
-                // Disable committing when already committing or if we don't have all the data needed
-                EditorGUI.BeginDisabledGroup(lockCommit || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
+                GUILayout.BeginVertical(GUILayout.Height(
+                        Mathf.Clamp(Position.height * Styles.CommitAreaDefaultRatio,
+                        Styles.CommitAreaMinHeight,
+                        Styles.CommitAreaMaxHeight))
+                );
                 {
-                    GUILayout.BeginHorizontal();
+                    GUILayout.Space(Styles.CommitAreaPadding);
+
+                    GUILayout.Label(SummaryLabel);
+                    commitMessage = EditorGUILayout.TextField(commitMessage, Styles.TextFieldStyle);
+
+                    GUILayout.Space(Styles.CommitAreaPadding * 2);
+
+                    GUILayout.Label(DescriptionLabel);
+                    commitBody = EditorGUILayout.TextArea(commitBody, Styles.CommitDescriptionFieldStyle, GUILayout.ExpandHeight(true));
+
+                    GUILayout.Space(Styles.CommitAreaPadding);
+
+                    // Disable committing when already committing or if we don't have all the data needed
+                    EditorGUI.BeginDisabledGroup(lockCommit || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
                     {
-                        GUILayout.FlexibleSpace();
-                        if (GUILayout.Button(String.Format(CommitButton, currentBranch), Styles.CommitButtonStyle))
+                        GUILayout.BeginHorizontal();
                         {
-                            Commit();
+                            GUILayout.FlexibleSpace();
+                            if (GUILayout.Button(String.Format(CommitButton, currentBranch), Styles.CommitButtonStyle))
+                            {
+                                Commit();
+                            }
                         }
+                        GUILayout.EndHorizontal();
                     }
-                    GUILayout.EndHorizontal();
+                    EditorGUI.EndDisabledGroup();
+
+                    GUILayout.Space(Styles.CommitAreaPadding);
                 }
-                EditorGUI.EndDisabledGroup();
+                GUILayout.EndVertical();
+
+                GUILayout.Space(Styles.CommitAreaPadding);
             }
-            GUILayout.EndVertical();
+            GUILayout.EndHorizontal();
         }
 
         private void SelectAll()

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesetTreeView.cs

@@ -124,7 +124,17 @@ namespace GitHub.Unity
                     // Base path label
                     if (!string.IsNullOrEmpty(tree.Path))
                     {
-                        GUILayout.Label(String.Format(BasePathLabel, tree.Path));
+                        GUILayout.BeginHorizontal();
+                        {
+                            var iconRect = GUILayoutUtility.GetRect(Styles.CommitIconSize, Styles.CommitIconSize, GUILayout.ExpandWidth(false));
+                            iconRect.y += 2;
+                            iconRect.x += 2;
+
+                            GUI.DrawTexture(iconRect, Styles.FolderIcon, ScaleMode.ScaleToFit);
+
+                            GUILayout.Label(string.Format(BasePathLabel, tree.Path));
+                        }
+                        GUILayout.EndHorizontal();
                     }
 
                     GUILayout.BeginHorizontal();
@@ -224,6 +234,7 @@ namespace GitHub.Unity
 
         private void TreeNode(FileTreeNode node)
         {
+            GUILayout.Space(Styles.TreeVerticalSpacing);
             var target = node.Target;
             var isFolder = node.Children.Any();
 
@@ -283,31 +294,54 @@ namespace GitHub.Unity
                     }
                 }
 
+                GitFileStatus? status = null;
+
                 // Node icon and label
                 GUILayout.BeginHorizontal();
                 {
                     GUILayout.Space(Styles.CommitIconHorizontalPadding);
                     var iconRect = GUILayoutUtility.GetRect(Styles.CommitIconSize, Styles.CommitIconSize, GUILayout.ExpandWidth(false));
+                    iconRect.y += 2;
+                    iconRect.x -= 2;
+
                     if (Event.current.type == EventType.Repaint)
                     {
-                        GUI.DrawTexture(iconRect, node.Icon ?? (isFolder ? Styles.FolderIcon : Styles.DefaultAssetIcon),
+                        GUI.DrawTexture(iconRect,
+                            node.Icon ?? (isFolder ? Styles.FolderIcon : Styles.DefaultAssetIcon),
                             ScaleMode.ScaleToFit);
                     }
+
+                    var statusRect = new Rect(
+                        iconRect.xMax - 9,
+                        iconRect.yMax - 7,
+                        9,
+                        9);
+
+                    // Current status (if any)
+                    if (target != null)
+                    {
+                        status = entries[entryCommitTargets.IndexOf(target)].Status;
+                        var statusIcon = Styles.GetGitFileStatusIcon(status.Value);
+                        GUI.DrawTexture(statusRect, statusIcon);
+                    }
+
                     GUILayout.Space(Styles.CommitIconHorizontalPadding);
                 }
                 GUILayout.EndHorizontal();
-                GUILayout.Label(new GUIContent(node.Label, node.RepositoryPath), GUILayout.ExpandWidth(true));
-
-                GUILayout.FlexibleSpace();
 
-                // Current status (if any)
-                if (target != null)
+                // Make the text gray and strikethrough if the file is deleted
+                if (status == GitFileStatus.Deleted)
                 {
-                    var status = entries[entryCommitTargets.IndexOf(target)].Status;
-                    var statusIcon = Styles.GetGitFileStatusIcon(status);
-                    GUILayout.Label(statusIcon != null ? new GUIContent(statusIcon) : new GUIContent(status.ToString()),
-                        GUILayout.ExpandWidth(false), GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight));
+                    GUILayout.Label(new GUIContent(node.Label, node.RepositoryPath), Styles.DeletedFileLabel, GUILayout.ExpandWidth(true));
+                    var labelRect = GUILayoutUtility.GetLastRect();
+                    var strikeRect = new Rect(labelRect.xMin, labelRect.center.y, labelRect.width, 1);
+                    EditorGUI.DrawRect(strikeRect, Color.gray);
                 }
+                else
+                {
+                    GUILayout.Label(new GUIContent(node.Label, node.RepositoryPath), GUILayout.ExpandWidth(true));
+                }
+                GUILayout.FlexibleSpace();
             }
             GUILayout.EndHorizontal();