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

Merge branch 'skinnable-combo-counter' into skinnable-score-display

Browse Source
This commit is contained in:
Dean Herbert
2020-10-15 17:52:06 +09:00
parent 43e5cb90e2 37e9f331ad
commit 90ff8ff050
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
View File

@ -6,8 +6,6 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Skinning; using osu.Game.Skinning;
using osuTK; using osuTK;
@ -248,10 +246,6 @@ namespace osu.Game.Screens.Play.HUD
return difference * rolling_duration; return difference * rolling_duration;
} }
private Drawable createSpriteText() => skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) ?? new OsuSpriteText private Drawable createSpriteText() => new LegacySpriteText(skin);
{
Font = OsuFont.Numeric.With(size: 40),
UseFullGlyphHeight = false,
};
} }
} }

1
osu.Game/Skinning/HUDSkinComponents.cs
View File

@ -6,7 +6,6 @@ namespace osu.Game.Skinning
public enum HUDSkinComponents public enum HUDSkinComponents
{ {
ComboCounter, ComboCounter,
ScoreText,
ScoreCounter ScoreCounter
} }
} }

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

@ -324,12 +324,19 @@ namespace osu.Game.Skinning
return null; return null;
} }
private const string score_font = "score";
private bool hasScoreFont => this.HasFont(score_font);
public override Drawable GetDrawableComponent(ISkinComponent component) public override Drawable GetDrawableComponent(ISkinComponent component)
{ {
switch (component) switch (component)
{ {
case HUDSkinComponent hudComponent: case HUDSkinComponent hudComponent:
{ {
if (!hasScoreFont)
return null;
switch (hudComponent.Component) switch (hudComponent.Component)
{ {
case HUDSkinComponents.ComboCounter: case HUDSkinComponents.ComboCounter:
@ -337,14 +344,6 @@ namespace osu.Game.Skinning
case HUDSkinComponents.ScoreCounter: case HUDSkinComponents.ScoreCounter:
return new LegacyScoreCounter(this); return new LegacyScoreCounter(this);
case HUDSkinComponents.ScoreText:
const string font = "score";
if (!this.HasFont(font))
return null;
return new LegacySpriteText(this, font);
} }
return null; return null;

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

@ -12,7 +12,7 @@ namespace osu.Game.Skinning
{ {
private readonly LegacyGlyphStore glyphStore; private readonly LegacyGlyphStore glyphStore;
public LegacySpriteText(ISkin skin, string font) public LegacySpriteText(ISkin skin, string font = "score")
{ {
Shadow = false; Shadow = false;
UseFullGlyphHeight = false; UseFullGlyphHeight = false;