From 6a6718ebab2963afefacb3f05628ffdb7d48367c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Oct 2020 17:20:10 +0900
Subject: [PATCH] Allow bypassing origin/anchor setting of skinnable components

It makes little sense to set these when using RelativeSizeAxes.Both
---
 .../Screens/Play/HUD/SkinnableComboCounter.cs     |  1 +
 osu.Game/Skinning/SkinnableDrawable.cs            | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index a67953c790..36f615e9d0 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Screens.Play.HUD
         public SkinnableComboCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), createDefault)
         {
+            CentreComponent = false;
         }
 
         private IComboCounter skinnedCounter;
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index d9a5036649..5a48bc4baf 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Skinning
         /// </summary>
         public Drawable Drawable { get; private set; }
 
+        /// <summary>
+        /// Whether the drawable component should be centered in available space.
+        /// Defaults to true.
+        /// </summary>
+        public bool CentreComponent { get; set; } = true;
+
         public new Axes AutoSizeAxes
         {
             get => base.AutoSizeAxes;
@@ -84,8 +90,13 @@ namespace osu.Game.Skinning
             if (Drawable != null)
             {
                 scaling.Invalidate();
-                Drawable.Origin = Anchor.Centre;
-                Drawable.Anchor = Anchor.Centre;
+
+                if (CentreComponent)
+                {
+                    Drawable.Origin = Anchor.Centre;
+                    Drawable.Anchor = Anchor.Centre;
+                }
+
                 InternalChild = Drawable;
             }
             else