mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 05:32:54 +08:00
Remove remaining early base
lookup calls which were missed
This commit is contained in:
parent
1435fe24ae
commit
46d55d5e61
@ -33,10 +33,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
|
||||
if (containerLookup.Ruleset == null)
|
||||
return base.GetDrawableComponent(lookup);
|
||||
|
||||
// Skin has configuration.
|
||||
if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer d)
|
||||
return d;
|
||||
|
||||
switch (containerLookup.Component)
|
||||
{
|
||||
case GlobalSkinnableContainers.MainHUDComponents:
|
||||
|
@ -97,10 +97,6 @@ namespace osu.Game.Skinning
|
||||
switch (lookup)
|
||||
{
|
||||
case GlobalSkinnableContainerLookup containerLookup:
|
||||
|
||||
if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer c)
|
||||
return c;
|
||||
|
||||
switch (containerLookup.Component)
|
||||
{
|
||||
case GlobalSkinnableContainers.SongSelect:
|
||||
|
@ -359,9 +359,6 @@ namespace osu.Game.Skinning
|
||||
switch (lookup)
|
||||
{
|
||||
case GlobalSkinnableContainerLookup containerLookup:
|
||||
if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer c)
|
||||
return c;
|
||||
|
||||
switch (containerLookup.Component)
|
||||
{
|
||||
case GlobalSkinnableContainers.MainHUDComponents:
|
||||
|
@ -14,6 +14,7 @@ using osu.Framework.Audio.Sample;
|
||||
using osu.Framework.Bindables;
|
||||
using osu.Framework.Extensions.TypeExtensions;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Textures;
|
||||
using osu.Framework.IO.Stores;
|
||||
using osu.Framework.Logging;
|
||||
@ -196,7 +197,7 @@ namespace osu.Game.Skinning
|
||||
if (!LayoutInfos.TryGetValue(containerLookup.Component, out var layoutInfo)) return null;
|
||||
if (!layoutInfo.TryGetDrawableInfo(containerLookup.Ruleset, out var drawableInfos)) return null;
|
||||
|
||||
return new UserConfiguredLayoutContainer
|
||||
return new Container
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
ChildrenEnumerable = drawableInfos.Select(i => i.CreateInstance())
|
||||
|
@ -67,9 +67,6 @@ namespace osu.Game.Skinning
|
||||
switch (lookup)
|
||||
{
|
||||
case GlobalSkinnableContainerLookup containerLookup:
|
||||
if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer c)
|
||||
return c;
|
||||
|
||||
// Only handle global level defaults for now.
|
||||
if (containerLookup.Ruleset != null)
|
||||
return null;
|
||||
|
@ -1,15 +0,0 @@
|
||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||
// See the LICENCE file in the repository root for full licence text.
|
||||
|
||||
using osu.Framework.Graphics.Containers;
|
||||
|
||||
namespace osu.Game.Skinning
|
||||
{
|
||||
/// <summary>
|
||||
/// This signifies that a <see cref="Skin.GetDrawableComponent"/> call resolved a configuration created
|
||||
/// by a user in their skin. Generally this should be given priority over any local defaults or overrides.
|
||||
/// </summary>
|
||||
public partial class UserConfiguredLayoutContainer : Container
|
||||
{
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user