From 792a1ad75bb531c9e67c4ede4f2ac9c781f3bb6a Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 31 Aug 2017 09:26:36 -0400 Subject: [PATCH 1/3] Removing broadmode code --- .../Editor/GitHub.Unity/UI/BranchesView.cs | 26 +----- .../Editor/GitHub.Unity/UI/HistoryView.cs | 82 ------------------- 2 files changed, 2 insertions(+), 106 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs index 3a9c627f9..2ee285a38 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs @@ -110,14 +110,8 @@ private void HandleRepositoryBranchChangeEvent(string obj) public override void Refresh() { base.Refresh(); - var historyView = ((Window)Parent).HistoryTab; -#if ENABLE_BROADMODE - if (historyView.BroadMode) - historyView.Refresh(); - else -#endif - RefreshEmbedded(); + RefreshEmbedded(); } public void RefreshEmbedded() @@ -131,23 +125,7 @@ public void RefreshEmbedded() public override void OnGUI() { - var historyView = ((Window)Parent).HistoryTab; - -#if ENABLE_BROADMODE - if (historyView.BroadMode) - historyView.OnGUI(); - else -#endif - { - OnEmbeddedGUI(); - -#if ENABLE_BROADMODE - if (Event.current.type == EventType.Repaint && historyView.EvaluateBroadMode()) - { - Refresh(); - } -#endif - } + OnEmbeddedGUI(); } public void OnEmbeddedGUI() diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs index 013c861c2..834726a61 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs @@ -48,9 +48,6 @@ class HistoryView : Subview [NonSerialized] private bool updated = true; [NonSerialized] private bool useScrollTime; -#if ENABLE_BROADMODE - [SerializeField] private bool broadMode; -#endif [SerializeField] private Vector2 detailsScroll; [SerializeField] private Object historyTarget; [SerializeField] private Vector2 scroll; @@ -106,12 +103,6 @@ public override void Refresh() { base.Refresh(); RefreshLog(); -#if ENABLE_BROADMODE - if (broadMode) - { - ((Window)Parent).BranchesTab.RefreshEmbedded(); - } -#endif } public override void OnSelectionChange() @@ -131,44 +122,8 @@ public override void OnGUI() return; } -#if ENABLE_BROADMODE - if (broadMode) - OnBroadGUI(); - else -#endif OnEmbeddedGUI(); - -#if ENABLE_BROADMODE - if (Event.current.type == EventType.Repaint && EvaluateBroadMode()) - { - Refresh(); - } -#endif } - -#if ENABLE_BROADMODE - public void OnBroadGUI() - { - GUILayout.BeginHorizontal(); - { - GUILayout.BeginVertical( - GUILayout.MinWidth(Styles.BroadModeBranchesMinWidth), - GUILayout.MaxWidth(Mathf.Max(Styles.BroadModeBranchesMinWidth, Position.width * Styles.BroadModeBranchesRatio)) - ); - { - ((Window)Parent).BranchesTab.OnEmbeddedGUI(); - } - GUILayout.EndVertical(); - GUILayout.BeginVertical(); - { - OnEmbeddedGUI(); - } - GUILayout.EndVertical(); - } - GUILayout.EndHorizontal(); - } -#endif - private void AttachHandlers(IRepository repository) { if (repository == null) @@ -793,43 +748,6 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect) EditorGUI.DrawRect(bottomTimelineRect, timelineBarColor); } -#if ENABLE_BROADMODE - private bool EvaluateBroadMode() - { - var past = broadMode; - - // Flip when the limits are breached - if (Position.width > Styles.BroadModeLimit) - { - broadMode = true; - } - else if (Position.width < Styles.NarrowModeLimit) - { - broadMode = false; - } - - // Show the layout notification while scaling - var window = (Window)Parent; - var scaled = Position.width != lastWidth; - lastWidth = Position.width; - - if (scaled) - { - window.ShowNotification(new GUIContent(Styles.FolderIcon), Styles.ModeNotificationDelay); - } - - // Return whether we flipped - return broadMode != past; - } -#endif - -#if ENABLE_BROADMODE - public bool BroadMode - { - get { return broadMode; } - } -#endif - private float EntryHeight { get { return Styles.HistoryEntryHeight + Styles.HistoryEntryPadding; } From 59645e30e1112ca47b5ea7e217eaab6fcfa61b5d Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 31 Aug 2017 09:27:27 -0400 Subject: [PATCH 2/3] Revert "Removing broadmode code" This reverts commit 792a1ad75bb531c9e67c4ede4f2ac9c781f3bb6a. --- .../Editor/GitHub.Unity/UI/BranchesView.cs | 26 +++++- .../Editor/GitHub.Unity/UI/HistoryView.cs | 82 +++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs index 2ee285a38..3a9c627f9 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs @@ -110,8 +110,14 @@ private void HandleRepositoryBranchChangeEvent(string obj) public override void Refresh() { base.Refresh(); + var historyView = ((Window)Parent).HistoryTab; - RefreshEmbedded(); +#if ENABLE_BROADMODE + if (historyView.BroadMode) + historyView.Refresh(); + else +#endif + RefreshEmbedded(); } public void RefreshEmbedded() @@ -125,7 +131,23 @@ public void RefreshEmbedded() public override void OnGUI() { - OnEmbeddedGUI(); + var historyView = ((Window)Parent).HistoryTab; + +#if ENABLE_BROADMODE + if (historyView.BroadMode) + historyView.OnGUI(); + else +#endif + { + OnEmbeddedGUI(); + +#if ENABLE_BROADMODE + if (Event.current.type == EventType.Repaint && historyView.EvaluateBroadMode()) + { + Refresh(); + } +#endif + } } public void OnEmbeddedGUI() diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs index 834726a61..013c861c2 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs @@ -48,6 +48,9 @@ class HistoryView : Subview [NonSerialized] private bool updated = true; [NonSerialized] private bool useScrollTime; +#if ENABLE_BROADMODE + [SerializeField] private bool broadMode; +#endif [SerializeField] private Vector2 detailsScroll; [SerializeField] private Object historyTarget; [SerializeField] private Vector2 scroll; @@ -103,6 +106,12 @@ public override void Refresh() { base.Refresh(); RefreshLog(); +#if ENABLE_BROADMODE + if (broadMode) + { + ((Window)Parent).BranchesTab.RefreshEmbedded(); + } +#endif } public override void OnSelectionChange() @@ -122,8 +131,44 @@ public override void OnGUI() return; } +#if ENABLE_BROADMODE + if (broadMode) + OnBroadGUI(); + else +#endif OnEmbeddedGUI(); + +#if ENABLE_BROADMODE + if (Event.current.type == EventType.Repaint && EvaluateBroadMode()) + { + Refresh(); + } +#endif } + +#if ENABLE_BROADMODE + public void OnBroadGUI() + { + GUILayout.BeginHorizontal(); + { + GUILayout.BeginVertical( + GUILayout.MinWidth(Styles.BroadModeBranchesMinWidth), + GUILayout.MaxWidth(Mathf.Max(Styles.BroadModeBranchesMinWidth, Position.width * Styles.BroadModeBranchesRatio)) + ); + { + ((Window)Parent).BranchesTab.OnEmbeddedGUI(); + } + GUILayout.EndVertical(); + GUILayout.BeginVertical(); + { + OnEmbeddedGUI(); + } + GUILayout.EndVertical(); + } + GUILayout.EndHorizontal(); + } +#endif + private void AttachHandlers(IRepository repository) { if (repository == null) @@ -748,6 +793,43 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect) EditorGUI.DrawRect(bottomTimelineRect, timelineBarColor); } +#if ENABLE_BROADMODE + private bool EvaluateBroadMode() + { + var past = broadMode; + + // Flip when the limits are breached + if (Position.width > Styles.BroadModeLimit) + { + broadMode = true; + } + else if (Position.width < Styles.NarrowModeLimit) + { + broadMode = false; + } + + // Show the layout notification while scaling + var window = (Window)Parent; + var scaled = Position.width != lastWidth; + lastWidth = Position.width; + + if (scaled) + { + window.ShowNotification(new GUIContent(Styles.FolderIcon), Styles.ModeNotificationDelay); + } + + // Return whether we flipped + return broadMode != past; + } +#endif + +#if ENABLE_BROADMODE + public bool BroadMode + { + get { return broadMode; } + } +#endif + private float EntryHeight { get { return Styles.HistoryEntryHeight + Styles.HistoryEntryPadding; } From 365be757f653d59bf71e48b44a7f3b1975e4bcb3 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 31 Aug 2017 09:35:58 -0400 Subject: [PATCH 3/3] Enable "Broad Mode" by default --- .../Editor/GitHub.Unity/UI/BranchesView.cs | 10 ++-------- .../Assets/Editor/GitHub.Unity/UI/HistoryView.cs | 16 +--------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs index 3a9c627f9..fd8baba41 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs @@ -111,13 +111,11 @@ public override void Refresh() { base.Refresh(); var historyView = ((Window)Parent).HistoryTab; - -#if ENABLE_BROADMODE if (historyView.BroadMode) historyView.Refresh(); else -#endif - RefreshEmbedded(); + + RefreshEmbedded(); } public void RefreshEmbedded() @@ -133,20 +131,16 @@ public override void OnGUI() { var historyView = ((Window)Parent).HistoryTab; -#if ENABLE_BROADMODE if (historyView.BroadMode) historyView.OnGUI(); else -#endif { OnEmbeddedGUI(); -#if ENABLE_BROADMODE if (Event.current.type == EventType.Repaint && historyView.EvaluateBroadMode()) { Refresh(); } -#endif } } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs index 013c861c2..57c9a1ca1 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs @@ -48,9 +48,7 @@ class HistoryView : Subview [NonSerialized] private bool updated = true; [NonSerialized] private bool useScrollTime; -#if ENABLE_BROADMODE [SerializeField] private bool broadMode; -#endif [SerializeField] private Vector2 detailsScroll; [SerializeField] private Object historyTarget; [SerializeField] private Vector2 scroll; @@ -106,12 +104,10 @@ public override void Refresh() { base.Refresh(); RefreshLog(); -#if ENABLE_BROADMODE if (broadMode) { ((Window)Parent).BranchesTab.RefreshEmbedded(); } -#endif } public override void OnSelectionChange() @@ -131,22 +127,17 @@ public override void OnGUI() return; } -#if ENABLE_BROADMODE if (broadMode) OnBroadGUI(); else -#endif - OnEmbeddedGUI(); + OnEmbeddedGUI(); -#if ENABLE_BROADMODE if (Event.current.type == EventType.Repaint && EvaluateBroadMode()) { Refresh(); } -#endif } -#if ENABLE_BROADMODE public void OnBroadGUI() { GUILayout.BeginHorizontal(); @@ -167,7 +158,6 @@ public void OnBroadGUI() } GUILayout.EndHorizontal(); } -#endif private void AttachHandlers(IRepository repository) { @@ -793,7 +783,6 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect) EditorGUI.DrawRect(bottomTimelineRect, timelineBarColor); } -#if ENABLE_BROADMODE private bool EvaluateBroadMode() { var past = broadMode; @@ -821,14 +810,11 @@ private bool EvaluateBroadMode() // Return whether we flipped return broadMode != past; } -#endif -#if ENABLE_BROADMODE public bool BroadMode { get { return broadMode; } } -#endif private float EntryHeight {