Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Cleanup the switching of the tabs #332

Merged
StanleyGoldman merged 1 commit into from
Sep 20, 2017
Merged

Cleanup the switching of the tabs #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,15 @@ public virtual void Initialize(IApplicationManager applicationManager)
Logger.Trace("Initialize ApplicationManager:{0} Initialized:{1}", applicationManager, initialized);
}

public void InitializeWindow(IApplicationManager applicationManager)
public void InitializeWindow(IApplicationManager applicationManager, bool requiresRedraw = true)
{
if (inLayout)
{
initializeWasCalled = true;
cachedManager = applicationManager;
return;
}

initialized = true;
initializeWasCalled = true;
Manager = applicationManager;
cachedRepository = Environment.Repository;
initialized = true;
Initialize(applicationManager);
OnRepositoryChanged(null);
Redraw();
if (requiresRedraw)
Redraw();
}

public virtual void Redraw()
Expand All @@ -51,14 +45,14 @@ public virtual void Awake()
{
Logger.Trace("Awake Initialized:{0}", initialized);
if (!initialized)
InitializeWindow(EntryPoint.ApplicationManager);
InitializeWindow(EntryPoint.ApplicationManager, false);
}

public virtual void OnEnable()
{
Logger.Trace("OnEnable Initialized:{0}", initialized);
if (!initialized)
InitializeWindow(EntryPoint.ApplicationManager);
InitializeWindow(EntryPoint.ApplicationManager, false);
}

public virtual void OnDisable()
Expand All @@ -81,8 +75,9 @@ private void OnGUI()
{
if (Event.current.type == EventType.layout)
{
if (cachedRepository != Environment.Repository)
if (cachedRepository != Environment.Repository || initializeWasCalled)
{
initializeWasCalled = false;
OnRepositoryChanged(cachedRepository);
cachedRepository = Environment.Repository;
}
Expand All @@ -95,11 +90,6 @@ private void OnGUI()
if (Event.current.type == EventType.repaint)
{
inLayout = false;
if (initializeWasCalled)
{
initializeWasCalled = false;
InitializeWindow(cachedManager);
}
}
}

Expand All @@ -113,7 +103,7 @@ public virtual void OnSelectionChange()
public IApplicationManager Manager { get; private set; }
public abstract bool IsBusy { get; }
public IRepository Repository { get { return inLayout ? cachedRepository : Environment.Repository; } }
public bool HasRepository { get { return Environment.RepositoryPath != null; } }
public bool HasRepository { get { return Repository != null; } }

protected ITaskManager TaskManager { get { return Manager.TaskManager; } }
protected IGitClient GitClient { get { return Manager.GitClient; } }
Expand Down
116 changes: 57 additions & 59 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Window : BaseWindow
private const string Window_RepoBranchTooltip = "Active branch";

[NonSerialized] private double notificationClearTime = -1;
[SerializeField] private SubTab nextTab = SubTab.History;
[SerializeField] private SubTab changeTab = SubTab.History;
[SerializeField] private SubTab activeTab = SubTab.History;
[SerializeField] private InitProjectView initProjectView = new InitProjectView();
[SerializeField] private BranchesView branchesView = new BranchesView();
Expand Down Expand Up @@ -73,6 +73,9 @@ public override void Initialize(IApplicationManager applicationManager)
{
base.Initialize(applicationManager);

if (!HasRepository && activeTab != SubTab.InitProject && activeTab != SubTab.Settings)
changeTab = activeTab = SubTab.InitProject;

HistoryView.InitializeView(this);
ChangesView.InitializeView(this);
BranchesView.InitializeView(this);
Expand Down Expand Up @@ -120,21 +123,6 @@ 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();
}
Expand All @@ -146,8 +134,16 @@ public override void OnRepositoryChanged(IRepository oldRepository)
DetachHandlers(oldRepository);
AttachHandlers(Repository);

if (Repository != null && activeTab == SubTab.InitProject)
{
changeTab = SubTab.History;
}

UpdateActiveTab();

if (ActiveView != null)
ActiveView.OnRepositoryChanged(oldRepository);

}

public override void OnSelectionChange()
Expand Down Expand Up @@ -207,15 +203,6 @@ private bool MaybeUpdateData(out string repoRemote)
bool repoDataChanged = false;
if (Repository != null)
{
if (activeTab == SubTab.InitProject)
{
if (nextTab == SubTab.InitProject)
{
nextTab = SubTab.History;
repoDataChanged = true;
}
}

var currentBranchString = (Repository.CurrentBranch.HasValue ? Repository.CurrentBranch.Value.Name : null);
if (repoBranch != currentBranchString)
{
Expand All @@ -235,15 +222,6 @@ private bool MaybeUpdateData(out string repoRemote)
}
else
{
if (!(activeTab == SubTab.InitProject || activeTab == SubTab.Settings))
{
if (!(nextTab == SubTab.InitProject || activeTab == SubTab.Settings))
{
nextTab = SubTab.InitProject;
repoDataChanged = true;
}
}

if (repoBranch != null)
{
repoBranch = null;
Expand Down Expand Up @@ -303,7 +281,7 @@ private void DoToolbarGUI()
// Subtabs & toolbar
Rect mainNavRect = EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
{
SubTab changeTab = activeTab;
changeTab = activeTab;
EditorGUI.BeginChangeCheck();
{
if (HasRepository)
Expand All @@ -321,7 +299,7 @@ private void DoToolbarGUI()

if (EditorGUI.EndChangeCheck())
{
nextTab = changeTab;
UpdateActiveTab();
}

GUILayout.FlexibleSpace();
Expand All @@ -332,6 +310,28 @@ private void DoToolbarGUI()
EditorGUILayout.EndHorizontal();
}

private void UpdateActiveTab()
{
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();

// this triggers a repaint
Repaint();
}

private void DoAccountDropdown()
{
GenericMenu accountMenu = new GenericMenu();
Expand Down Expand Up @@ -393,6 +393,25 @@ private static SubTab TabButton(SubTab tab, string title, SubTab activeTab)
return GUILayout.Toggle(activeTab == tab, title, EditorStyles.toolbarButton) ? tab : activeTab;
}

private Subview ToView(SubTab tab)
{
switch (tab)
{
case SubTab.InitProject:
return initProjectView;
case SubTab.History:
return historyView;
case SubTab.Changes:
return changesView;
case SubTab.Branches:
return branchesView;
case SubTab.Settings:
return settingsView;
default:
throw new ArgumentOutOfRangeException();
}
}

public HistoryView HistoryView
{
get { return historyView; }
Expand Down Expand Up @@ -420,29 +439,7 @@ public InitProjectView InitProjectView

private Subview ActiveView
{
get
{
return ToView(activeTab);
}
}

private Subview ToView(SubTab tab)
{
switch (tab)
{
case SubTab.InitProject:
return initProjectView;
case SubTab.History:
return historyView;
case SubTab.Changes:
return changesView;
case SubTab.Branches:
return branchesView;
case SubTab.Settings:
return settingsView;
default:
throw new ArgumentOutOfRangeException();
}
get { return ToView(activeTab); }
}

public override bool IsBusy
Expand All @@ -452,6 +449,7 @@ public override bool IsBusy

private enum SubTab
{
None,
InitProject,
History,
Changes,
Expand Down