From 9d091c96b81d2bf461890137cc32d87daa7b4972 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Jul 2019 17:52:50 +0900
Subject: [PATCH] Use cache to ensure correct DrawSize when deciding scaling

---
 osu.Game/Skinning/SkinnableDrawable.cs | 32 +++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index a30bdbd2dc..5d1ca98bfd 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osuTK;
 
@@ -55,6 +56,10 @@ protected SkinnableDrawable(string name, Func<ISkinSource, bool> allowFallback =
 
         private readonly Func<string, T> createDefault;
 
+        private readonly Cached scaling = new Cached();
+
+        private bool isDefault;
+
         protected virtual T CreateDefault(string name) => createDefault(name);
 
         /// <summary>
@@ -66,7 +71,7 @@ protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             Drawable = skin.GetDrawableComponent(componentName);
 
-            bool isDefault = false;
+            isDefault = false;
 
             if (Drawable == null && allowFallback)
             {
@@ -76,7 +81,23 @@ protected override void SkinChanged(ISkinSource skin, bool allowFallback)
 
             if (Drawable != null)
             {
-                if (confineMode != ConfineMode.NoScaling && (!isDefault || ApplySizeRestrictionsToDefault))
+                scaling.Invalidate();
+                Drawable.Origin = Anchor.Centre;
+                Drawable.Anchor = Anchor.Centre;
+
+                InternalChild = Drawable;
+            }
+            else
+                ClearInternal();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!scaling.IsValid)
+            {
+                if (Drawable != null && confineMode != ConfineMode.NoScaling && (!isDefault || ApplySizeRestrictionsToDefault))
                 {
                     bool applyScaling = confineMode == ConfineMode.ScaleToFit ||
                                         (confineMode == ConfineMode.ScaleDownToFit && (Drawable.DrawSize.X > DrawSize.X || Drawable.DrawSize.Y > DrawSize.Y));
@@ -90,13 +111,8 @@ protected override void SkinChanged(ISkinSource skin, bool allowFallback)
                     }
                 }
 
-                Drawable.Origin = Anchor.Centre;
-                Drawable.Anchor = Anchor.Centre;
-
-                InternalChild = Drawable;
+                scaling.Validate();
             }
-            else
-                ClearInternal();
         }
     }