mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 10:52:53 +08:00
Merge pull request #6598 from peppy/fix-datetime-results
Fix DateTime display sizing on results screen
This commit is contained in:
commit
ad6e828571
@ -253,9 +253,7 @@ namespace osu.Game.Screens.Ranking.Pages
|
|||||||
{
|
{
|
||||||
this.date = date;
|
this.date = date;
|
||||||
|
|
||||||
AutoSizeAxes = Axes.Y;
|
AutoSizeAxes = Axes.Both;
|
||||||
|
|
||||||
Width = 140;
|
|
||||||
|
|
||||||
Masking = true;
|
Masking = true;
|
||||||
CornerRadius = 5;
|
CornerRadius = 5;
|
||||||
@ -271,22 +269,26 @@ namespace osu.Game.Screens.Ranking.Pages
|
|||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Colour = colours.Gray6,
|
Colour = colours.Gray6,
|
||||||
},
|
},
|
||||||
new OsuSpriteText
|
new FillFlowContainer
|
||||||
{
|
{
|
||||||
Origin = Anchor.CentreLeft,
|
AutoSizeAxes = Axes.Both,
|
||||||
Anchor = Anchor.CentreLeft,
|
Direction = FillDirection.Horizontal,
|
||||||
Text = date.ToShortDateString(),
|
|
||||||
Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
|
Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
|
||||||
Colour = Color4.White,
|
Spacing = new Vector2(10),
|
||||||
|
Children = new[]
|
||||||
|
{
|
||||||
|
new OsuSpriteText
|
||||||
|
{
|
||||||
|
Text = date.ToShortDateString(),
|
||||||
|
Colour = Color4.White,
|
||||||
|
},
|
||||||
|
new OsuSpriteText
|
||||||
|
{
|
||||||
|
Text = date.ToShortTimeString(),
|
||||||
|
Colour = Color4.White,
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
new OsuSpriteText
|
|
||||||
{
|
|
||||||
Origin = Anchor.CentreRight,
|
|
||||||
Anchor = Anchor.CentreRight,
|
|
||||||
Text = date.ToShortTimeString(),
|
|
||||||
Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
|
|
||||||
Colour = Color4.White,
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user