Restyle the action bar

Move the action bar up top, move the account along with it, and make things wordwrapped.

Author: shana

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

@@ -226,6 +226,7 @@ public static GUIStyle HeaderBranchLabelStyle
                     headerBranchLabelStyle = new GUIStyle(EditorStyles.label);
                     headerBranchLabelStyle.name = "HeaderBranchLabelStyle";
                     headerBranchLabelStyle.margin = new RectOffset(0, 0, 0, 0);
+                    headerBranchLabelStyle.wordWrap = true;
                 }
                 return headerBranchLabelStyle;
             }
@@ -240,6 +241,7 @@ public static GUIStyle HeaderRepoLabelStyle
                     headerRepoLabelStyle = new GUIStyle(EditorStyles.boldLabel);
                     headerRepoLabelStyle.name = "HeaderRepoLabelStyle";
                     headerRepoLabelStyle.margin = new RectOffset(0, 0, 0, 0);
+                    headerRepoLabelStyle.wordWrap = true;
                 }
                 return headerRepoLabelStyle;
             }

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

@@ -219,10 +219,12 @@ public override void OnUI()
 
             if (HasRepository)
             {
+                DoActionbarGUI();
+                GUILayout.BeginVertical(Styles.HeaderBoxStyle);
                 DoHeaderGUI();
+                GUILayout.EndVertical();
             }
 
-            DoActionbarGUI();
             DoToolbarGUI();
 
             var rect = GUILayoutUtility.GetLastRect();
@@ -434,7 +436,7 @@ private void DetachHandlers(IRepository repository)
 
         private void DoHeaderGUI()
         {
-            GUILayout.BeginHorizontal(Styles.HeaderBoxStyle);
+            GUILayout.BeginHorizontal();
             {
                 GUILayout.Space(3);
                 GUILayout.BeginVertical(GUILayout.Width(16));
@@ -483,9 +485,6 @@ private void DoToolbarGUI()
                 }
 
                 GUILayout.FlexibleSpace();
-
-                if (GUILayout.Button("Account", EditorStyles.toolbarDropDown))
-                    DoAccountDropdown();
             }
             EditorGUILayout.EndHorizontal();
         }
@@ -494,8 +493,6 @@ private void DoActionbarGUI()
         {
             GUILayout.BeginHorizontal(EditorStyles.toolbar);
             {
-                GUILayout.FlexibleSpace();
-
                 if (hasRemote)
                 {
                     EditorGUI.BeginDisabledGroup(currentRemoteName == null);
@@ -550,6 +547,11 @@ private void DoActionbarGUI()
                         PopupWindow.OpenWindow(PopupWindow.PopupViewType.PublishView);
                     }
                 }
+
+                GUILayout.FlexibleSpace();
+
+                if (GUILayout.Button("Account", EditorStyles.toolbarDropDown))
+                    DoAccountDropdown();
             }
             EditorGUILayout.EndHorizontal();
         }