Only transform the user's skin, not all fallbacks

peppy · Sep 30, 2024 · 485eb19 · 485eb19
1 parent 52136f0
commit 485eb19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
@@ -67,28 +67,12 @@ protected override void RefreshSources()
             // Populate a local list first so we can adjust the returned order as we go.
             var sources = new List<ISkin>();
 
-            Debug.Assert(ParentSource != null);
-
-            foreach (var source in ParentSource.AllSources)
-            {
-                switch (source)
-                {
-                    case Skin skin:
-                        sources.Add(GetRulesetTransformedSkin(skin));
-                        break;
-                }
-            }
-
-            // TODO: check
-            int lastDefaultSkinIndex = sources.IndexOf(sources.OfType<TrianglesSkin>().LastOrDefault());
+            // We want to transform the current user's skin for the current ruleset.
+            if (ParentSource is SkinManager skinManager)
+                sources.Add(GetRulesetTransformedSkin(skinManager.CurrentSkin.Value));
 
             // Ruleset resources should be given the ability to override game-wide defaults
-            // This is achieved by placing them before the last instance of DefaultSkin.
-            // Note that DefaultSkin may not be present in some test scenes.
-            if (lastDefaultSkinIndex >= 0)
-                sources.Insert(lastDefaultSkinIndex, rulesetResourcesSkin);
-            else
-                sources.Add(rulesetResourcesSkin);
+            sources.Add(rulesetResourcesSkin);
 
             SetSources(sources);
         }

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
@@ -256,7 +256,7 @@ public IEnumerable<ISkin> AllSources
                 // This handles cases where a user skin doesn't have the required resources for complete display of
                 // certain elements.
 
-                if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultClassicSkin)
+                if (CurrentSkin.Value != DefaultClassicSkin)
                     yield return DefaultClassicSkin;
 
                 if (CurrentSkin.Value != trianglesSkin)