From 7666e8b9320b8e84a4ff621cc53bf477518b7b1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Aug 2024 15:11:57 +0900
Subject: [PATCH] Remove `SupportsClosestAnchor` for the time being

This may have had a good reason to be added, but I can't find that
reason, so let's keep things simple for the time being.
---
 .../Skinning/Argon/ArgonManiaComboCounter.cs              | 5 +----
 .../Skinning/Legacy/LegacyManiaComboCounter.cs            | 4 +---
 osu.Game/Overlays/SkinEditor/SkinEditor.cs                | 3 ---
 osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs      | 3 +--
 osu.Game/Skinning/ISerialisableDrawable.cs                | 8 --------
 5 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonManiaComboCounter.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonManiaComboCounter.cs
index ad515528fb..9a4eea993d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonManiaComboCounter.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonManiaComboCounter.cs
@@ -10,20 +10,17 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
-    public partial class ArgonManiaComboCounter : ComboCounter, ISerialisableDrawable
+    public partial class ArgonManiaComboCounter : ComboCounter
     {
         private OsuSpriteText text = null!;
 
         protected override double RollingDuration => 500;
         protected override Easing RollingEasing => Easing.OutQuint;
 
-        bool ISerialisableDrawable.SupportsClosestAnchor => false;
-
         [BackgroundDependencyLoader]
         private void load(ScoreProcessor scoreProcessor)
         {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaComboCounter.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaComboCounter.cs
index a51a50c604..c1fe4a1028 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaComboCounter.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaComboCounter.cs
@@ -11,10 +11,8 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
-    public partial class LegacyManiaComboCounter : LegacyComboCounter, ISerialisableDrawable
+    public partial class LegacyManiaComboCounter : LegacyComboCounter
     {
-        bool ISerialisableDrawable.SupportsClosestAnchor => false;
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
diff --git a/osu.Game/Overlays/SkinEditor/SkinEditor.cs b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
index 7bbd875542..484af34603 100644
--- a/osu.Game/Overlays/SkinEditor/SkinEditor.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinEditor.cs
@@ -444,9 +444,6 @@ namespace osu.Game.Overlays.SkinEditor
                 drawableComponent.Origin = Anchor.TopCentre;
                 drawableComponent.Anchor = Anchor.TopCentre;
                 drawableComponent.Y = targetContainer.DrawSize.Y / 2;
-
-                if (!component.SupportsClosestAnchor)
-                    component.UsesFixedAnchor = true;
             }
 
             try
diff --git a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
index c86221c7fb..722ffd6d07 100644
--- a/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
+++ b/osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
@@ -103,8 +103,7 @@ namespace osu.Game.Overlays.SkinEditor
         {
             var closestItem = new TernaryStateRadioMenuItem("Closest", MenuItemType.Standard, _ => applyClosestAnchors())
             {
-                State = { Value = GetStateFromSelection(selection, c => !c.Item.UsesFixedAnchor), },
-                Action = { Disabled = selection.Any(c => !c.Item.SupportsClosestAnchor) },
+                State = { Value = GetStateFromSelection(selection, c => !c.Item.UsesFixedAnchor) }
             };
 
             yield return new OsuMenuItem("Anchor")
diff --git a/osu.Game/Skinning/ISerialisableDrawable.cs b/osu.Game/Skinning/ISerialisableDrawable.cs
index 898186bcc1..c9dcaca6d1 100644
--- a/osu.Game/Skinning/ISerialisableDrawable.cs
+++ b/osu.Game/Skinning/ISerialisableDrawable.cs
@@ -27,14 +27,6 @@ namespace osu.Game.Skinning
         /// </summary>
         bool IsEditable => true;
 
-        /// <summary>
-        /// Whether this component supports the "closest" anchor.
-        /// </summary>
-        /// <remarks>
-        /// This is disabled by some components that shift position automatically.
-        /// </remarks>
-        bool SupportsClosestAnchor => true;
-
         /// <summary>
         /// In the context of the skin layout editor, whether this <see cref="ISerialisableDrawable"/> has a permanent anchor defined.
         /// If <see langword="false"/>, this <see cref="ISerialisableDrawable"/>'s <see cref="Drawable.Anchor"/> is automatically determined by proximity,