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

Refactor star rating display layout with flexibility in mind

Browse Source
This commit is contained in:
Salman Ahmed
2021-08-18 11:03:35 +03:00
parent 3a0dd5b019
commit 74d6c26520
2 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
View File

@ -44,40 +44,63 @@ namespace osu.Game.Beatmaps.Drawables
/// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
/// </summary>
/// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display.</param>
public StarRatingDisplay(StarDifficulty starDifficulty)
/// <param name="size">The size of the star rating display.</param>
public StarRatingDisplay(StarDifficulty starDifficulty, StarRatingDisplaySize size = StarRatingDisplaySize.Regular)
{
Current.Value = starDifficulty;
Size = new Vector2(52f, 20f);
AutoSizeAxes = Axes.Both;
InternalChild = new CircularContainer
{
Masking = true,
RelativeSizeAxes = Axes.Both,
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both,
},
starIcon = new SpriteIcon
new GridContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Margin = new MarginPadding { Right = 30f },
Icon = FontAwesome.Solid.Star,
Size = new Vector2(8f),
AutoSizeAxes = Axes.Both,
Margin = size == StarRatingDisplaySize.Small
? new MarginPadding { Horizontal = 7f }
: new MarginPadding { Horizontal = 8f, Vertical = 2f },
ColumnDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.Absolute, 3f),
new Dimension(GridSizeMode.AutoSize, minSize: 25f),
},
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
Content = new[]
{
new[]
{
starIcon = new SpriteIcon
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.Solid.Star,
Size = new Vector2(8f),
},
Empty(),
starsText = new OsuSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Margin = new MarginPadding { Bottom = 1.5f },
// todo: this should be size: 12f, but to match up with the design, it needs to be 14.4f
// see https://github.com/ppy/osu-framework/issues/3271.
Font = OsuFont.Torus.With(size: 14.4f, weight: FontWeight.Bold),
Shadow = false,
}
}
}
},
starsText = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Margin = new MarginPadding { Left = 10f, Bottom = 2f },
// todo: this should be size: 12f, but to match up with the design, it needs to be 14.4f
// see https://github.com/ppy/osu-framework/issues/3271.
Font = OsuFont.Torus.With(size: 14.4f, weight: FontWeight.Bold),
Shadow = false,
}
}
};
}
@ -97,4 +120,10 @@ namespace osu.Game.Beatmaps.Drawables
}, true);
}
}
public enum StarRatingDisplaySize
{
Small,
Regular,
}
}