Change SkinProvidingContainer to also return parent sources in `All…

…Sources`
peppy · Sep 30, 2024 · c62cbb0 · c62cbb0
1 parent d2b855d
commit c62cbb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -172,7 +172,7 @@ public Drawable GetDrawableComponent(ISkinComponentLookup lookup)
 
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : null;
 
-            public IEnumerable<ISkin> AllSources => new[] { this };
+            public IEnumerable<ISkin> AllSources => Array.Empty<ISkin>();
 
             [CanBeNull]
             public event Action SourceChanged;

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -99,10 +99,7 @@ public IEnumerable<ISkin> AllSources
                     yield return i.skin;
 
                 if (ParentSource != null)
-                {
-                    foreach (var skin in ParentSource.AllSources)
-                        yield return skin;
-                }
+                    yield return ParentSource;
             }
         }