Refactoring out SetActiveTab function; renaming some variables

Author: StanleyGoldman

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

@@ -237,16 +237,6 @@ private void DetachHandlers(IRepository repository)
             repository.OnRepositoryInfoChanged -= RefreshOnMainThread;
         }
 
-
-        private void SwitchView(Subview from, Subview to)
-        {
-            GUI.FocusControl(null);
-            if (from != null)
-                from.OnDisable();
-            to.OnEnable();
-            Refresh();
-        }
-
         private void DoHeaderGUI()
         {
             GUILayout.BeginHorizontal(Styles.HeaderBoxStyle);
@@ -277,26 +267,25 @@ private void DoToolbarGUI()
             // Subtabs & toolbar
             Rect mainNavRect = EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
             {
-                SubTab tab = activeTab;
+                SubTab changeTab = activeTab;
                 EditorGUI.BeginChangeCheck();
                 {
                     if (HasRepository)
                     {
-                        tab = TabButton(SubTab.Changes, ChangesTitle, tab);
-                        tab = TabButton(SubTab.History, HistoryTitle, tab);
-                        tab = TabButton(SubTab.Branches, BranchesTitle, tab);
+                        changeTab = TabButton(SubTab.Changes, ChangesTitle, changeTab);
+                        changeTab = TabButton(SubTab.History, HistoryTitle, changeTab);
+                        changeTab = TabButton(SubTab.Branches, BranchesTitle, changeTab);
                     }
                     else
                     {
-                        tab = TabButton(SubTab.History, HistoryTitle, tab);
+                        changeTab = TabButton(SubTab.History, HistoryTitle, changeTab);
                     }
-                    tab = TabButton(SubTab.Settings, SettingsTitle, tab);
+                    changeTab = TabButton(SubTab.Settings, SettingsTitle, changeTab);
                 }
+
                 if (EditorGUI.EndChangeCheck())
                 {
-                    var from = ActiveView;
-                    activeTab = tab;
-                    SwitchView(from, ActiveView);
+                    SetActiveTab(changeTab);
                 }
 
                 GUILayout.FlexibleSpace();
@@ -307,6 +296,28 @@ private void DoToolbarGUI()
             EditorGUILayout.EndHorizontal();
         }
 
+        private void SetActiveTab(SubTab changeTab)
+        {
+            if (changeTab != activeTab)
+            {
+                var from = ActiveView;
+                activeTab = changeTab;
+                SwitchView(@from, ActiveView);
+            }
+        }
+
+        private void SwitchView(Subview fromView, Subview toView)
+        {
+            GUI.FocusControl(null);
+
+            if (fromView != null)
+                fromView.OnDisable();
+
+            toView.OnEnable();
+
+            Refresh();
+        }
+
         private void DoAccountDropdown()
         {
             GenericMenu accountMenu = new GenericMenu();