RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-09 07:39:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standardise all local SkinComponentsContainerLookup variables to containerLookup

Browse Source
This commit is contained in:
Dean Herbert 2023-02-16 15:33:56 +09:00
parent eea0cd3cf8
commit 76f7accd13
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
View File

@ -28,9 +28,9 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup) public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup)
{ {
if (lookup is SkinComponentsContainerLookup componentLookup) if (lookup is SkinComponentsContainerLookup containerLookup)
{ {
switch (componentLookup.Target) switch (containerLookup.Target)
{ {
case SkinComponentsContainerLookup.TargetArea.MainHUDComponents: case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
var components = base.GetDrawableComponent(lookup) as Container; var components = base.GetDrawableComponent(lookup) as Container;

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

@ -90,8 +90,8 @@ namespace osu.Game.Skinning
switch (lookup) switch (lookup)
{ {
case SkinComponentsContainerLookup componentLookup: case SkinComponentsContainerLookup containerLookup:
switch (componentLookup.Target) switch (containerLookup.Target)
{ {
case SkinComponentsContainerLookup.TargetArea.SongSelect: case SkinComponentsContainerLookup.TargetArea.SongSelect:
var songSelectComponents = new DefaultSkinComponentsContainer(_ => var songSelectComponents = new DefaultSkinComponentsContainer(_ =>

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

@ -45,9 +45,9 @@ namespace osu.Game.Skinning
public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup) public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup)
{ {
if (lookup is SkinComponentsContainerLookup targetComponent) if (lookup is SkinComponentsContainerLookup containerLookup)
{ {
switch (targetComponent.Target) switch (containerLookup.Target)
{ {
case SkinComponentsContainerLookup.TargetArea.MainHUDComponents: case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
// this should exist in LegacySkin instead, but there isn't a fallback skin for LegacySkins yet. // this should exist in LegacySkin instead, but there isn't a fallback skin for LegacySkins yet.

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

@ -343,8 +343,8 @@ namespace osu.Game.Skinning
switch (lookup) switch (lookup)
{ {
case SkinComponentsContainerLookup componentLookup: case SkinComponentsContainerLookup containerLookup:
switch (componentLookup.Target) switch (containerLookup.Target)
{ {
case SkinComponentsContainerLookup.TargetArea.MainHUDComponents: case SkinComponentsContainerLookup.TargetArea.MainHUDComponents:
var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container => var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>

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

@ -165,8 +165,8 @@ namespace osu.Game.Skinning
case SkinnableSprite.SpriteComponentLookup sprite: case SkinnableSprite.SpriteComponentLookup sprite:
return this.GetAnimation(sprite.LookupName, false, false); return this.GetAnimation(sprite.LookupName, false, false);
case SkinComponentsContainerLookup componentLookup: case SkinComponentsContainerLookup containerLookup:
if (!DrawableComponentInfo.TryGetValue(componentLookup.Target, out var skinnableInfo)) if (!DrawableComponentInfo.TryGetValue(containerLookup.Target, out var skinnableInfo))
return null; return null;
var components = new List<Drawable>(); var components = new List<Drawable>();

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

@ -68,8 +68,8 @@ namespace osu.Game.Skinning
switch (lookup) switch (lookup)
{ {
case SkinComponentsContainerLookup componentLookup: case SkinComponentsContainerLookup containerLookup:
switch (componentLookup.Target) switch (containerLookup.Target)
{ {
case SkinComponentsContainerLookup.TargetArea.SongSelect: case SkinComponentsContainerLookup.TargetArea.SongSelect:
var songSelectComponents = new DefaultSkinComponentsContainer(_ => var songSelectComponents = new DefaultSkinComponentsContainer(_ =>