h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 10:18:22 +08:00
Code Issues Releases Wiki Activity

add a DRAWABLE_BADGE_SIZE const and center badges

Browse Source
This commit is contained in:
jorolf 2018-04-16 18:51:35 +02:00
parent af0c49cca8
commit 2a18b4c3f8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/TestCaseUserProfile.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Tests.Visual
{
AwardedAt = DateTimeOffset.Now,
Description = i.ToString(),
ImageUrl = "Flags/__"
ImageUrl = "https://assets.ppy.sh/profile-badges/contributor.jpg"
}).ToArray()), false));
checkSupporterTag(false);

16
osu.Game/Overlays/Profile/Header/BadgeContainer.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Profile.Header
Origin = Anchor.BottomLeft,
Direction = FillDirection.Vertical,
Padding = outer_padding,
Width = badge_size.X + outer_padding.TotalHorizontal * 2,
Width = DrawableBadge.DRAWABLE_BADGE_SIZE.X + outer_padding.TotalHorizontal,
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{
@ -68,6 +68,8 @@ namespace osu.Game.Overlays.Profile.Header
AutoSizeAxes = Axes.Both,
Child = badgeFlowContainer = new FillFlowContainer
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both,
}
@ -86,7 +88,7 @@ namespace osu.Game.Overlays.Profile.Header
visibleBadge = (visibleBadge + 1) % badgeCount;
badgeFlowContainer.MoveToX(-badge_size.X * visibleBadge, 500, Easing.InOutQuad);
badgeFlowContainer.MoveToX(-DrawableBadge.DRAWABLE_BADGE_SIZE.X * visibleBadge, 500, Easing.InOutQuad);
}
private int visibleBadge;
@ -116,7 +118,8 @@ namespace osu.Game.Overlays.Profile.Header
{
LoadComponentAsync(new DrawableBadge(badge)
{
Size = badge_size + outer_padding.Total,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
}, badgeFlowContainer.Add);
}
}
@ -136,7 +139,7 @@ namespace osu.Game.Overlays.Profile.Header
badgeFlowContainer.MoveToX(-badge_size.X * visibleBadge, 500, Easing.InOutQuad);
badgeFlowContainer.Direction = FillDirection.Horizontal;
outerBadgeContainer.AutoSizeAxes = Axes.Y;
outerBadgeContainer.Width = badge_size.X + outer_padding.TotalHorizontal * 2;
outerBadgeContainer.Width = DrawableBadge.DRAWABLE_BADGE_SIZE.X + outer_padding.TotalHorizontal;
}
private class OuterBadgeContainer : FillFlowContainer
@ -161,12 +164,15 @@ namespace osu.Game.Overlays.Profile.Header
private class DrawableBadge : Container, IHasTooltip
{
public static readonly Vector2 DRAWABLE_BADGE_SIZE = badge_size + outer_padding.Total;
private readonly Badge badge;
public DrawableBadge(Badge badge)
{
this.badge = badge;
Padding = new MarginPadding(3);
Padding = outer_padding;
Size = DRAWABLE_BADGE_SIZE;
}
[BackgroundDependencyLoader]