From ed48524f2150f49a6be6f7bd38a555f899b0b563 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Wed, 13 Dec 2017 09:56:07 -0500 Subject: [PATCH] Setting the field values on Tree objects in OnEnable I'm not entirely sure why, but the values of Tree seem to get unset randomly on domain reload. This at least helps to make sure I dont lose these values, until I figure out what I'm doing wrong. --- .../Assets/Editor/GitHub.Unity/UI/BranchesView.cs | 11 ++++++----- .../Assets/Editor/GitHub.Unity/UI/ChangesView.cs | 9 +++++---- .../Assets/Editor/GitHub.Unity/UI/HistoryView.cs | 9 +++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs index 49a13bb6b..51e9213d4 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs @@ -155,14 +155,10 @@ private void Render() private void BuildTree() { - if (treeLocals == null) + if (treeLocals == null || treeRemotes == null) { treeLocals = new BranchesTree(); - treeLocals.Title = LocalTitle; - treeRemotes = new BranchesTree(); - treeRemotes.Title = RemoteTitle; - treeRemotes.IsRemote = true; TreeOnEnable(); } @@ -179,12 +175,17 @@ private void TreeOnEnable() { if (treeLocals != null) { + treeLocals.Title = LocalTitle; + treeLocals.OnEnable(); treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon); } if (treeRemotes != null) { + treeRemotes.Title = RemoteTitle; + treeRemotes.IsRemote = true; + treeRemotes.OnEnable(); treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon); } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs index 3bf1f1674..e00ae5ad9 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs @@ -196,10 +196,6 @@ private void BuildTree() if (treeChanges == null) { treeChanges = new ChangesTree(); - treeChanges.Title = "Changes"; - treeChanges.DisplayRootNode = false; - treeChanges.IsCheckable = true; - treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString(); TreeOnEnable(); } @@ -212,6 +208,11 @@ private void TreeOnEnable() { if (treeChanges != null) { + treeChanges.Title = "Changes"; + treeChanges.DisplayRootNode = false; + treeChanges.IsCheckable = true; + treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString(); + treeChanges.OnEnable(); treeChanges.UpdateIcons(Styles.FolderIcon); } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs index 432de0463..8a9c9d1f0 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs @@ -719,10 +719,6 @@ private void BuildTree() if (treeChanges == null) { treeChanges = new ChangesTree(); - treeChanges.Title = "Changes"; - treeChanges.IsSelectable = false; - treeChanges.DisplayRootNode = false; - treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString(); TreeOnEnable(); } @@ -735,6 +731,11 @@ private void TreeOnEnable() { if (treeChanges != null) { + treeChanges.Title = "Changes"; + treeChanges.IsSelectable = false; + treeChanges.DisplayRootNode = false; + treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString(); + treeChanges.OnEnable(); treeChanges.UpdateIcons(Styles.FolderIcon); }