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

Use With(s => ...) extension for better readability

Browse Source
This commit is contained in:
Salman Ahmed 2020-08-19 07:47:02 +03:00
parent 5759ffff6f
commit ee9fa11d14
4 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
View File

@ -137,19 +137,20 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
public bool Winning public bool Winning
{ {
set => displayedSpriteText.Font = value set => updateFont(value);
}
protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
{
displayedSpriteText = s;
displayedSpriteText.Spacing = new Vector2(-6);
updateFont(false);
});
private void updateFont(bool winning)
=> displayedSpriteText.Font = winning
? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true) ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true)
: OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true); : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true);
}
protected override OsuSpriteText CreateSpriteText()
{
displayedSpriteText = base.CreateSpriteText();
displayedSpriteText.Spacing = new Vector2(-6);
Winning = false;
return displayedSpriteText;
}
} }
} }
} }

10
osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
View File

@ -49,13 +49,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
public override void Increment(double amount) public override void Increment(double amount)
=> Current.Value += amount; => Current.Value += amount;
protected override OsuSpriteText CreateSpriteText() protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
{ {
var spriteText = base.CreateSpriteText(); s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true); s.Spacing = new Vector2(-2, 0);
spriteText.Spacing = new Vector2(-2, 0); });
return spriteText;
}
} }
} }
} }

10
osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
View File

@ -44,13 +44,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING; protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
protected override OsuSpriteText CreateSpriteText() protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
{ {
var spriteText = base.CreateSpriteText(); s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true); s.Spacing = new Vector2(-2, 0);
spriteText.Spacing = new Vector2(-2, 0); });
return spriteText;
}
public override void Increment(int amount) public override void Increment(int amount)
=> Current.Value += amount; => Current.Value += amount;

14
osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
View File

@ -28,16 +28,14 @@ namespace osu.Game.Screens.Ranking.Expanded
protected override string FormatCount(long count) => count.ToString("N0"); protected override string FormatCount(long count) => count.ToString("N0");
protected override OsuSpriteText CreateSpriteText() protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
{ {
var spriteText = base.CreateSpriteText(); s.Anchor = Anchor.TopCentre;
spriteText.Anchor = Anchor.TopCentre; s.Origin = Anchor.TopCentre;
spriteText.Origin = Anchor.TopCentre;
spriteText.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true); s.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
spriteText.Spacing = new Vector2(-5, 0); s.Spacing = new Vector2(-5, 0);
return spriteText; });
}
public override void Increment(long amount) public override void Increment(long amount)
=> Current.Value += amount; => Current.Value += amount;