diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 1199db587a..11a8112ecf 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Extensions
component.Origin = info.Origin;
if (component is ISkinnableDrawable skinnable)
- skinnable.UsingClosestAnchor = info.UsingClosestAnchor;
+ skinnable.OverridesClosestAnchor = info.OverridesClosestAnchor;
if (component is Container container)
{
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index 5c6bb7299a..31edab5bc2 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play.HUD
[Resolved(canBeNull: true)]
private HUDOverlay hud { get; set; }
- public bool UsingClosestAnchor { get; set; } = true;
+ public bool OverridesClosestAnchor { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 97f33c0e07..bf9bed3fe3 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.HUD
[Resolved(canBeNull: true)]
private HUDOverlay hud { get; set; }
- public bool UsingClosestAnchor { get; set; } = true;
+ public bool OverridesClosestAnchor { get; set; }
public DefaultComboCounter()
{
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 82f014d1e3..3488de70a9 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Play.HUD
}
}
- public bool UsingClosestAnchor { get; set; } = true;
+ public bool OverridesClosestAnchor { get; set; }
public DefaultHealthDisplay()
{
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 56eaab4408..de534f516a 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Play.HUD
[Resolved(canBeNull: true)]
private HUDOverlay hud { get; set; }
- public bool UsingClosestAnchor { get; set; } = true;
+ public bool OverridesClosestAnchor { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index f263b5accc..a16adfebbc 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
[Resolved]
private OsuColour colours { get; set; }
- public bool UsingClosestAnchor { get; set; } = true;
+ public bool OverridesClosestAnchor { get; set; }
[BackgroundDependencyLoader(true)]
private void load(DrawableRuleset drawableRuleset)
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 9640bf1d4d..aff98b843b 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Play.HUD
set => counterContainer.Alpha = value ? 1 : 0;
}
- public bool UsingClosestAnchor { get; set; } = true;
+ public bool OverridesClosestAnchor { get; set; }
public LegacyComboCounter()
{
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index a76634a1f0..207bea77ce 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -32,8 +32,8 @@ namespace osu.Game.Screens.Play.HUD
public Anchor Origin { get; set; }
- ///
- public bool UsingClosestAnchor { get; set; } = true;
+ ///
+ public bool OverridesClosestAnchor { get; set; }
public List Children { get; } = new List();
@@ -56,9 +56,7 @@ namespace osu.Game.Screens.Play.HUD
Anchor = component.Anchor;
Origin = component.Origin;
- UsingClosestAnchor =
- // true if it's not an ISkinnableDrawable
- !(component is ISkinnableDrawable skinnable) || skinnable.UsingClosestAnchor;
+ OverridesClosestAnchor = component is ISkinnableDrawable { OverridesClosestAnchor: true };
if (component is Container container)
{
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index e8687b9ab1..a00a2c0275 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play
private IClock referenceClock;
- public bool UsingClosestAnchor { get; set; } = true;
+ public bool OverridesClosestAnchor { get; set; }
public SongProgress()
{
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index f4476b9de7..7ddcebd662 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Skinning.Editor
private void updateDrawableAnchorIfUsingClosest(Drawable drawable)
{
- if (!(drawable is ISkinnableDrawable { UsingClosestAnchor: true })) return;
+ if (drawable is ISkinnableDrawable { OverridesClosestAnchor: true }) return;
var closestAnchor = getClosestAnchorForDrawable(drawable);
@@ -266,9 +266,9 @@ namespace osu.Game.Skinning.Editor
protected override IEnumerable