h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-27 18:23:21 +08:00
Code Issues Releases Wiki Activity

SkinnableTargetWrapper -> SkinnableTargetComponentsContainer

Browse Source
This commit is contained in:
smoogipoo 2021-05-13 18:51:23 +09:00
parent 01bc71acd2
commit 2f025f1967
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Skinning/DefaultSkin.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Skinning
switch (target.Target)
{
case SkinnableTarget.MainHUDComponents:
var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
{
var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();

2
osu.Game/Skinning/LegacySkin.cs
View File

@ -332,7 +332,7 @@ namespace osu.Game.Skinning
{
case SkinnableTarget.MainHUDComponents:
var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
{
var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();

2
osu.Game/Skinning/Skin.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Skinning
if (!DrawableComponentInfo.TryGetValue(target.Target, out var skinnableInfo))
return null;
return new SkinnableTargetWrapper
return new SkinnableTargetComponentsContainer
{
ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
};

10
osu.Game/Skinning/SkinnableTargetWrapper.cs → osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
View File

@ -9,11 +9,11 @@ using osu.Framework.Graphics.Containers;
namespace osu.Game.Skinning
{
/// <summary>
/// A container which groups the elements of a <see cref="SkinnableTargetContainer"/> into a single object.
/// Optionally also applies a default layout to the elements.
/// A container which groups the components of a <see cref="SkinnableTargetContainer"/> into a single object.
/// Optionally also applies a default layout to the components.
/// </summary>
[Serializable]
public class SkinnableTargetWrapper : Container, ISkinnableDrawable
public class SkinnableTargetComponentsContainer : Container, ISkinnableDrawable
{
public bool IsEditable => false;
@ -23,14 +23,14 @@ namespace osu.Game.Skinning
/// Construct a wrapper with defaults that should be applied once.
/// </summary>
/// <param name="applyDefaults">A function to apply the default layout.</param>
public SkinnableTargetWrapper(Action<Container> applyDefaults)
public SkinnableTargetComponentsContainer(Action<Container> applyDefaults)
: this()
{
this.applyDefaults = applyDefaults;
}
[JsonConstructor]
public SkinnableTargetWrapper()
public SkinnableTargetComponentsContainer()
{
RelativeSizeAxes = Axes.Both;
}

4
osu.Game/Skinning/SkinnableTargetContainer.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Skinning
{
public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
{
private SkinnableTargetWrapper content;
private SkinnableTargetComponentsContainer content;
public SkinnableTarget Target { get; }
@ -31,7 +31,7 @@ namespace osu.Game.Skinning
ClearInternal();
components.Clear();
content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetComponentsContainer;
if (content != null)
{