From 792a1ad75bb531c9e67c4ede4f2ac9c781f3bb6a Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 31 Aug 2017 09:26:36 -0400 Subject: [PATCH] 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; }