sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Ensure scorebar marker lookup is performed on the source the background is retrieved from

Browse Source
This commit is contained in:
Dean Herbert 2021-06-06 23:23:35 +09:00
parent b5f145cfa9
commit e10dfab2e8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Skinning/LegacyHealthDisplay.cs
View File

@ -35,7 +35,10 @@ namespace osu.Game.Skinning
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
isNewStyle = getTexture(skin, "marker") != null; var backgroundSource = skin.FindProvider(s => getTexture(s, "bg") != null);
// the marker lookup to decide which display style must be performed on the source of the bg, which is the most common element.
isNewStyle = getTexture(backgroundSource, "marker") != null;
// background implementation is the same for both versions. // background implementation is the same for both versions.
AddInternal(new Sprite { Texture = getTexture(skin, "bg") }); AddInternal(new Sprite { Texture = getTexture(skin, "bg") });
@ -76,7 +79,7 @@ namespace osu.Game.Skinning
protected override void Flash(JudgementResult result) => marker.Flash(result); protected override void Flash(JudgementResult result) => marker.Flash(result);
private static Texture getTexture(ISkinSource skin, string name) => skin.GetTexture($"scorebar-{name}"); private static Texture getTexture(ISkin skin, string name) => skin?.GetTexture($"scorebar-{name}");
private static Color4 getFillColour(double hp) private static Color4 getFillColour(double hp)
{ {