Remove the last of the tab control manual ifs

FenPhoenix · Mar 7, 2024 · f08dd17 · f08dd17
1 parent 8bbe2bf
commit f08dd17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/AngelLoader/Forms/CustomControls/LazyLoaded/Lazy_FMTabsBlocker.cs b/AngelLoader/Forms/CustomControls/LazyLoaded/Lazy_FMTabsBlocker.cs
@@ -53,22 +53,16 @@ private void Construct()
     {
         if (_constructed) return;
 
-        var container =
-            _which == WhichTabControl.Bottom
-                ? _owner.LowerSplitContainer.Panel2
-                : _owner.TopSplitContainer.Panel2;
+        FMTabControlGroup group = _owner.GetFMTabControlGroup(_which);
 
-        DarkArrowButton collapseButton =
-            _which == WhichTabControl.Bottom
-                ? _owner.BottomFMTabsCollapseButton
-                : _owner.TopFMTabsCollapseButton;
+        var container = group.Splitter.Panel2;
 
         Panel = new DrawnPanel
         {
             Location = Point.Empty,
             Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom,
             Size = new Size(
-                container.Width - collapseButton.Width,
+                container.Width - group.CollapseButton.Width,
                 container.Height),
             DarkModeDrawnBackColor = DarkColors.Fen_ControlBackground,
 

diff --git a/AngelLoader/Forms/MainForm.cs b/AngelLoader/Forms/MainForm.cs
@@ -128,7 +128,7 @@ need to check the accuracy of the selection itself (eg. in FMsDGV nav) so we can
     private readonly DarkButton[] _readmeControlButtons;
 
     private readonly FMTabControlGroup[] _fmTabControlGroups = new FMTabControlGroup[FormsData.WhichTabCount];
-    private FMTabControlGroup GetFMTabControlGroup(WhichTabControl which) => _fmTabControlGroups[(int)which];
+    internal FMTabControlGroup GetFMTabControlGroup(WhichTabControl which) => _fmTabControlGroups[(int)which];
 
     #endregion
 
@@ -5677,16 +5677,9 @@ private void MoveFMTab(WhichTabControl source, WhichTabControl dest, TabPage tab
 
     private void ShowFMTab(WhichTabControl which, TabPage tabPage)
     {
-        if (which == WhichTabControl.Bottom)
-        {
-            BottomFMTabsEmptyMessageLabel.Hide();
-            Lazy_LowerTabControl.TabControl.ShowTab(tabPage, true);
-        }
-        else
-        {
-            TopFMTabsEmptyMessageLabel.Hide();
-            TopFMTabControl.ShowTab(tabPage, true);
-        }
+        FMTabControlGroup group = GetFMTabControlGroup(which);
+        group.EmptyMessageLabel.Hide();
+        group.TabControl.ShowTab(tabPage, true);
     }
 
     private void HideFMTab(WhichTabControl which, TabPage tabPage)