h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 15:33:05 +08:00
Code Issues Releases Wiki Activity

Merge pull request #3403 from smoogipoo/results-auto-scaling

Browse Source 
Scale the results screen score to keep it in view
This commit is contained in:
Dean Herbert 2018-09-10 18:40:49 +09:00 committed by GitHub
commit 591ce67e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Screens/Ranking/ResultsPageScore.cs
View File

@ -29,6 +29,7 @@ namespace osu.Game.Screens.Ranking
{ {
public class ResultsPageScore : ResultsPage public class ResultsPageScore : ResultsPage
{ {
private Container scoreContainer;
private ScoreCounter scoreCounter; private ScoreCounter scoreCounter;
public ResultsPageScore(Score score, WorkingBeatmap beatmap) : base(score, beatmap) { } public ResultsPageScore(Score score, WorkingBeatmap beatmap) : base(score, beatmap) { }
@ -76,7 +77,7 @@ namespace osu.Game.Screens.Ranking
Size = new Vector2(150, 60), Size = new Vector2(150, 60),
Margin = new MarginPadding(20), Margin = new MarginPadding(20),
}, },
new Container scoreContainer = new Container
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
@ -92,8 +93,8 @@ namespace osu.Game.Screens.Ranking
}, },
scoreCounter = new SlowScoreCounter(6) scoreCounter = new SlowScoreCounter(6)
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.Centre,
Origin = Anchor.TopCentre, Origin = Anchor.Centre,
Colour = colours.PinkDarker, Colour = colours.PinkDarker,
Y = 10, Y = 10,
TextSize = 56, TextSize = 56,
@ -185,6 +186,13 @@ namespace osu.Game.Screens.Ranking
}); });
} }
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
scoreCounter.Scale = new Vector2(Math.Min(1f, (scoreContainer.DrawWidth - 20) / scoreCounter.DrawWidth));
}
private class DrawableScoreStatistic : Container private class DrawableScoreStatistic : Container
{ {
private readonly KeyValuePair<HitResult, object> statistic; private readonly KeyValuePair<HitResult, object> statistic;