Merge branch 'master' into fixes/window-update-loop

Author: StanleyGoldman

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

@@ -26,10 +26,10 @@ class Window : BaseWindow
         [NonSerialized] private double notificationClearTime = -1;
 
         [SerializeField] private SubTab activeTab = SubTab.History;
-        [SerializeField] private BranchesView branchesTab = new BranchesView();
-        [SerializeField] private ChangesView changesTab = new ChangesView();
-        [SerializeField] private HistoryView historyTab = new HistoryView();
-        [SerializeField] private SettingsView settingsTab = new SettingsView();
+        [SerializeField] private BranchesView branchesView = new BranchesView();
+        [SerializeField] private ChangesView changesView = new ChangesView();
+        [SerializeField] private HistoryView historyView = new HistoryView();
+        [SerializeField] private SettingsView settingsView = new SettingsView();
 
         [SerializeField] private string repoBranch;
         [SerializeField] private string repoUrl;
@@ -71,10 +71,10 @@ public override void Initialize(IApplicationManager applicationManager)
         {
             base.Initialize(applicationManager);
 
-            HistoryTab.InitializeView(this);
-            ChangesTab.InitializeView(this);
-            BranchesTab.InitializeView(this);
-            SettingsTab.InitializeView(this);
+            HistoryView.InitializeView(this);
+            ChangesView.InitializeView(this);
+            BranchesView.InitializeView(this);
+            SettingsView.InitializeView(this);
         }
 
         public override void OnEnable()
@@ -88,15 +88,15 @@ public override void OnEnable()
             // Set window title
             titleContent = new GUIContent(Title, Styles.SmallLogo);
 
-            if (ActiveTab != null)
-                ActiveTab.OnEnable();
+            if (ActiveView != null)
+                ActiveView.OnEnable();
         }
 
         public override void OnDisable()
         {
             base.OnDisable();
-            if (ActiveTab != null)
-                ActiveTab.OnDisable();
+            if (ActiveView != null)
+                ActiveView.OnDisable();
         }
 
         public override void OnDataUpdate()
@@ -117,8 +117,8 @@ public override void OnDataUpdate()
                 }
             }
 
-            if (ActiveTab != null)
-                ActiveTab.OnDataUpdate();
+            if (ActiveView != null)
+                ActiveView.OnDataUpdate();
         }
 
         public override void OnRepositoryChanged(IRepository oldRepository)
@@ -128,22 +128,22 @@ public override void OnRepositoryChanged(IRepository oldRepository)
             DetachHandlers(oldRepository);
             AttachHandlers(Repository);
 
-            if (ActiveTab != null)
-                ActiveTab.OnRepositoryChanged(oldRepository);
+            if (ActiveView != null)
+                ActiveView.OnRepositoryChanged(oldRepository);
         }
 
         public override void OnSelectionChange()
         {
             base.OnSelectionChange();
-            if (ActiveTab != null)
-                ActiveTab.OnSelectionChange();
+            if (ActiveView != null)
+                ActiveView.OnSelectionChange();
         }
 
         public override void Refresh()
         {
             base.Refresh();
-            if (ActiveTab != null)
-                ActiveTab.Refresh();
+            if (ActiveView != null)
+                ActiveView.Refresh();
             Repaint();
         }
 
@@ -159,9 +159,9 @@ public override void OnUI()
             DoToolbarGUI();
 
             // GUI for the active tab
-            if (ActiveTab != null)
+            if (ActiveView != null)
             {
-                ActiveTab.OnGUI();
+                ActiveView.OnGUI();
             }
         }
 
@@ -238,16 +238,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);
@@ -278,26 +268,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 = ActiveTab;
-                    activeTab = tab;
-                    SwitchView(from, ActiveTab);
+                    SetActiveTab(changeTab);
                 }
 
                 GUILayout.FlexibleSpace();
@@ -308,6 +297,28 @@ 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();
@@ -369,27 +380,27 @@ private static SubTab TabButton(SubTab tab, string title, SubTab activeTab)
             return GUILayout.Toggle(activeTab == tab, title, EditorStyles.toolbarButton) ? tab : activeTab;
         }
 
-        public HistoryView HistoryTab
+        public HistoryView HistoryView
         {
-            get { return historyTab; }
+            get { return historyView; }
         }
 
-        public ChangesView ChangesTab
+        public ChangesView ChangesView
         {
-            get { return changesTab; }
+            get { return changesView; }
         }
 
-        public BranchesView BranchesTab
+        public BranchesView BranchesView
         {
-            get { return branchesTab; }
+            get { return branchesView; }
         }
 
-        public SettingsView SettingsTab
+        public SettingsView SettingsView
         {
-            get { return settingsTab; }
+            get { return settingsView; }
         }
 
-        private Subview ActiveTab
+        private Subview ActiveView
         {
             get
             {
@@ -402,14 +413,14 @@ private Subview ToView(SubTab tab)
             switch (tab)
             {
                 case SubTab.History:
-                    return historyTab;
+                    return historyView;
                 case SubTab.Changes:
-                    return changesTab;
+                    return changesView;
                 case SubTab.Branches:
-                    return branchesTab;
+                    return branchesView;
                 case SubTab.Settings:
                 default:
-                    return settingsTab;
+                    return settingsView;
             }
         }