From bf05b9dc03cb1d80ecb61087085bbf94322cee72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 30 Sep 2024 17:29:31 +0900
Subject: [PATCH] Remove flag blocking parent lookups from a
 `SkinProvidingContainer`

I can't find a valid reason for this to exist.
---
 .../Skinning/RulesetSkinProvidingContainer.cs |  6 -----
 osu.Game/Skinning/SkinProvidingContainer.cs   | 22 +------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
index d736f4cdb5..d8599d77f6 100644
--- a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
@@ -31,12 +31,6 @@ namespace osu.Game.Skinning
         [CanBeNull]
         private readonly ISkin beatmapSkin;
 
-        /// <remarks>
-        /// This container already re-exposes all parent <see cref="ISkinSource"/> sources in a ruleset-usable form.
-        /// Therefore disallow falling back to any parent <see cref="ISkinSource"/> any further.
-        /// </remarks>
-        protected override bool AllowFallingBackToParent => false;
-
         protected override Container<Drawable> Content { get; } = new Container
         {
             RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 9aff187c9c..9b21d229ce 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -30,11 +30,6 @@ namespace osu.Game.Skinning
 
         protected ISkinSource? ParentSource { get; private set; }
 
-        /// <summary>
-        /// Whether falling back to parent <see cref="ISkinSource"/>s is allowed in this container.
-        /// </summary>
-        protected virtual bool AllowFallingBackToParent => true;
-
         protected virtual bool AllowDrawableLookup(ISkinComponentLookup lookup) => true;
 
         protected virtual bool AllowTextureLookup(string componentName) => true;
@@ -93,9 +88,6 @@ namespace osu.Game.Skinning
                     return skin;
             }
 
-            if (!AllowFallingBackToParent)
-                return null;
-
             return ParentSource?.FindProvider(lookupFunction);
         }
 
@@ -106,7 +98,7 @@ namespace osu.Game.Skinning
                 foreach (var i in skinSources)
                     yield return i.skin;
 
-                if (AllowFallingBackToParent && ParentSource != null)
+                if (ParentSource != null)
                 {
                     foreach (var skin in ParentSource.AllSources)
                         yield return skin;
@@ -123,9 +115,6 @@ namespace osu.Game.Skinning
                     return sourceDrawable;
             }
 
-            if (!AllowFallingBackToParent)
-                return null;
-
             return ParentSource?.GetDrawableComponent(lookup);
         }
 
@@ -138,9 +127,6 @@ namespace osu.Game.Skinning
                     return sourceTexture;
             }
 
-            if (!AllowFallingBackToParent)
-                return null;
-
             return ParentSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
@@ -153,9 +139,6 @@ namespace osu.Game.Skinning
                     return sourceSample;
             }
 
-            if (!AllowFallingBackToParent)
-                return null;
-
             return ParentSource?.GetSample(sampleInfo);
         }
 
@@ -174,9 +157,6 @@ namespace osu.Game.Skinning
                         return bindable;
                 }
 
-                if (!AllowFallingBackToParent)
-                    return null;
-
                 return ParentSource?.GetConfig<TLookup, TValue>(lookup);
             }
             finally