Changing where the tabs get swtiched; Inlining some methods for clarity

Author: StanleyGoldman

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

@@ -120,6 +120,21 @@ public override void OnDataUpdate()
                 }
             }
 
+            if (nextTab != activeTab)
+            {
+                var fromView = ActiveView;
+                activeTab = nextTab;
+
+                GUI.FocusControl(null);
+
+                if (fromView != null)
+                    fromView.OnDisable();
+
+                ActiveView.OnEnable();
+
+                Refresh();
+            }
+
             if (ActiveView != null)
                 ActiveView.OnDataUpdate();
         }
@@ -161,12 +176,6 @@ public override void OnUI()
 
             DoToolbarGUI();
 
-            if (nextTab != activeTab)
-            {
-                SetActiveTab(nextTab);
-                nextTab = activeTab;
-            }
-
             // GUI for the active tab
             if (ActiveView != null)
             {
@@ -323,28 +332,6 @@ private void DoToolbarGUI()
             EditorGUILayout.EndHorizontal();
         }
 
-        private void SetActiveTab(SubTab changeTab)
-        {
-            if (changeTab != activeTab)
-            {
-                var fromView = ActiveView;
-                activeTab = changeTab;
-                SwitchView(fromView, 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();