1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-16 01:42:58 +08:00

Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor

This commit is contained in:
Andrey Zavadskiy 2017-03-28 04:55:46 +03:00
commit 2348b619a3
2 changed files with 4 additions and 7 deletions

@ -1 +1 @@
Subproject commit 2d8a6c1699ff1acd3915fc28e8906dabf1b145a3
Subproject commit e67453159540f5008b5efadfbc12dfb3f4bee1f7

View File

@ -13,14 +13,14 @@ namespace osu.Game.Screens.Select.Leaderboards
{
public class DrawableRank : Container
{
private readonly Sprite sprite;
private readonly Sprite rankSprite;
public ScoreRank Rank { get; private set; }
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
sprite.Texture = textures.Get($@"Badges/ScoreRanks/{Rank.GetDescription()}");
rankSprite.Texture = textures.Get($@"Grades/{Rank.GetDescription()}");
}
public DrawableRank(ScoreRank rank)
@ -29,10 +29,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Children = new Drawable[]
{
sprite = new Sprite
{
RelativeSizeAxes = Axes.Both,
},
rankSprite = new Sprite { FillMode = FillMode.Fill },
};
}
}