From 01984de9c7ce603e063f914942775d55fe8793e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:13:32 +0900
Subject: [PATCH] Use existing `GetStateFromSelection` helper function

---
 .../Compose/Components/EditorSelectionHandler.cs   | 11 -----------
 .../Edit/Compose/Components/SelectionHandler.cs    | 11 +++++++++++
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs   | 14 +-------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 0fc305dcc4..6ab4ca8267 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -108,17 +108,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        /// <summary>
-        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
-        /// </summary>
-        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
-        {
-            if (selection.Any(func))
-                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
-
-            return TernaryState.False;
-        }
-
         #endregion
 
         #region Ternary state changes
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index cb3424a250..c0dbc5e7db 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -268,6 +268,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DeleteSelected();
         }
 
+        /// <summary>
+        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
+        /// </summary>
+        protected static TernaryState GetStateFromSelection<TObject>(IEnumerable<TObject> selection, Func<TObject, bool> func)
+        {
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+
+            return TernaryState.False;
+        }
+
         /// <summary>
         /// Called whenever the deletion of items has been requested.
         /// </summary>
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 0408ce74a6..044ad88333 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -53,21 +53,9 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    var countExisting = selection.Count(b => ((Drawable)b.Item).Anchor == a);
-                    var countTotal = selection.Count();
-
-                    TernaryState state;
-
-                    if (countExisting == countTotal)
-                        state = TernaryState.True;
-                    else if (countExisting > 0)
-                        state = TernaryState.Indeterminate;
-                    else
-                        state = TernaryState.False;
-
                     return new AnchorMenuItem(a, selection, _ => applyAnchor(a))
                     {
-                        State = { Value = state }
+                        State = { Value = GetStateFromSelection(selection, c => ((Drawable)c.Item).Anchor == a) }
                     };
                 });
             }