From c199b8fcb66fade4234b6e24597d42f4afccc442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 May 2022 21:35:36 +0200
Subject: [PATCH] Simplify state management in `ModColumn`

Bad sign when you can't follow your own code.

All of the various state changing methods were flattened into one
because it was too hard to follow what was calling what and why.
---
 osu.Game/Overlays/Mods/ModColumn.cs | 43 ++++++++++-------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index a792c0a81e..270839112a 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Mods
             set
             {
                 filter = value;
-                updateFilter();
+                updateState();
             }
         }
 
@@ -292,9 +292,7 @@ namespace osu.Game.Overlays.Mods
             {
                 panelFlow.ChildrenEnumerable = loaded;
 
-                updateActiveState();
-                updateToggleAllState();
-                updateFilter();
+                updateState();
 
                 foreach (var panel in panelFlow)
                 {
@@ -308,10 +306,19 @@ namespace osu.Game.Overlays.Mods
             });
         }
 
-        private void updateActiveState()
+        private void updateState()
         {
             foreach (var panel in panelFlow)
+            {
                 panel.Active.Value = SelectedMods.Contains(panel.Mod);
+                panel.ApplyFilter(Filter);
+            }
+
+            if (toggleAllCheckbox != null && !SelectionAnimationRunning)
+            {
+                toggleAllCheckbox.Alpha = panelFlow.Any(panel => !panel.Filtered.Value) ? 1 : 0;
+                toggleAllCheckbox.Current.Value = panelFlow.Where(panel => !panel.Filtered.Value).All(panel => panel.Active.Value);
+            }
         }
 
         /// <summary>
@@ -323,13 +330,12 @@ namespace osu.Game.Overlays.Mods
 
         private void panelStateChanged(ModPanel panel)
         {
-            updateToggleAllState();
-
             var newSelectedMods = panel.Active.Value
                 ? SelectedMods.Append(panel.Mod)
                 : SelectedMods.Except(panel.Mod.Yield());
 
             SelectedMods = newSelectedMods.ToArray();
+            updateState();
             if (!externalSelectionUpdateInProgress)
                 SelectionChangedByUser?.Invoke();
         }
@@ -364,7 +370,7 @@ namespace osu.Game.Overlays.Mods
             }
 
             SelectedMods = newSelection;
-            updateActiveState();
+            updateState();
 
             externalSelectionUpdateInProgress = false;
         }
@@ -403,15 +409,6 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        private void updateToggleAllState()
-        {
-            if (toggleAllCheckbox != null && !SelectionAnimationRunning)
-            {
-                toggleAllCheckbox.Alpha = panelFlow.Any(panel => !panel.Filtered.Value) ? 1 : 0;
-                toggleAllCheckbox.Current.Value = panelFlow.Where(panel => !panel.Filtered.Value).All(panel => panel.Active.Value);
-            }
-        }
-
         /// <summary>
         /// Selects all mods.
         /// </summary>
@@ -507,18 +504,6 @@ namespace osu.Game.Overlays.Mods
 
         #endregion
 
-        #region Filtering support
-
-        private void updateFilter()
-        {
-            foreach (var modPanel in panelFlow)
-                modPanel.ApplyFilter(Filter);
-
-            updateToggleAllState();
-        }
-
-        #endregion
-
         #region Keyboard selection support
 
         protected override bool OnKeyDown(KeyDownEvent e)