h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 20:33:11 +08:00
Code Issues Releases Wiki Activity

CI fixes and minor visual improvements

Browse Source
This commit is contained in:
EVAST9919 2017-11-12 07:31:08 +03:00
parent 569780d37b
commit 7c0b13f9ef
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs
View File

@ -6,7 +6,6 @@ using osu.Framework.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Users; using osu.Game.Users;
using System;
using osu.Framework.Input; using osu.Framework.Input;
namespace osu.Game.Overlays.BeatmapSet.Scores namespace osu.Game.Overlays.BeatmapSet.Scores

20
osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
View File

@ -22,6 +22,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
private const int fade_duration = 100; private const int fade_duration = 100;
private const float height = 30; private const float height = 30;
private const float side_margin = 20;
private const float flag_margin = 60;
private const float username_margin = 100;
private readonly Box background; private readonly Box background;
@ -46,8 +49,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Text = $"#{index + 1}", Text = $"#{index + 1}",
Font = @"Exo2.0-RegularItalic", Font = @"Exo2.0-RegularItalic",
RelativePositionAxes = Axes.X, Margin = new MarginPadding { Left = side_margin }
X = 0.02f
}, },
new DrawableFlag(score.User.Country?.FlagName) new DrawableFlag(score.User.Country?.FlagName)
{ {
@ -55,23 +57,22 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Width = 30, Width = 30,
Height = 20, Height = 20,
RelativePositionAxes = Axes.X, Margin = new MarginPadding { Left = flag_margin }
X = 0.06f
}, },
new ClickableUsername new ClickableUsername
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
User = score.User, User = score.User,
RelativePositionAxes = Axes.X, Margin = new MarginPadding { Left = username_margin }
X = 0.1f
}, },
modsContainer = new ScoreModsContainer modsContainer = new ScoreModsContainer
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Width = 60, RelativeSizeAxes = Axes.X,
Width = 0.05f,
RelativePositionAxes = Axes.X, RelativePositionAxes = Axes.X,
X = 0.45f X = 0.45f
}, },
@ -105,12 +106,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
}, },
new OsuSpriteText new OsuSpriteText
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
Text = $"{score.Statistics["300"]}/{score.Statistics["100"]}/{score.Statistics["50"]}", Text = $"{score.Statistics["300"]}/{score.Statistics["100"]}/{score.Statistics["50"]}",
Font = @"Exo2.0-RegularItalic", Font = @"Exo2.0-RegularItalic",
RelativePositionAxes = Axes.X, Margin = new MarginPadding { Right = side_margin }
X = 0.98f
}, },
}; };

10
osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
View File

@ -43,13 +43,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
set set
{ {
if (scores == value)
{
IsLoading = false;
return;
}
scores = value; scores = value;
updateScores(); updateScores();
} }
get { return scores; } get { return scores; }
@ -92,9 +86,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
loadingAnimation = new LoadingAnimation loadingAnimation = new LoadingAnimation
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.Centre,
Size = new Vector2(20), Size = new Vector2(20),
Margin = new MarginPadding { Top = 10 }, Margin = new MarginPadding { Top = 115 },
Alpha = 0, Alpha = 0,
}, },
}; };