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

Fix sizing of setList flow container

Browse Source
This commit is contained in:
Drew DeVault 2016-10-24 11:08:48 -04:00
parent 86bbe8688b
commit b0898a3ce0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/GameModes/Play/PlaySongSelect.cs
View File

@ -75,6 +75,7 @@ namespace osu.Game.GameModes.Play
public PlaySongSelect() public PlaySongSelect()
{ {
const float scrollWidth = 640; const float scrollWidth = 640;
const float bottomToolHeight = 50;
Children = new Drawable[] Children = new Drawable[]
{ {
new Container new Container
@ -112,9 +113,9 @@ namespace osu.Game.GameModes.Play
{ {
setList = new FlowContainer setList = new FlowContainer
{ {
Padding = new MarginPadding { Left = 25, Top = 25, Bottom = 25 }, Padding = new MarginPadding { Left = 25, Top = 25, Bottom = 25 + bottomToolHeight },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.Y,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirection.VerticalOnly,
Spacing = new Vector2(0, 5), Spacing = new Vector2(0, 5),
} }
@ -123,7 +124,7 @@ namespace osu.Game.GameModes.Play
new Container new Container
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Size = new Vector2(1, 50), Height = bottomToolHeight,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Children = new Drawable[] Children = new Drawable[]
@ -139,7 +140,7 @@ namespace osu.Game.GameModes.Play
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Size = new Vector2(100, 1), Width = 100,
Text = "Play", Text = "Play",
Colour = new Color4(238, 51, 153, 255), Colour = new Color4(238, 51, 153, 255),
Action = () => Push(new Player { Beatmap = beatmaps.GetBeatmap(selectedBeatmap) }), Action = () => Push(new Player { Beatmap = beatmaps.GetBeatmap(selectedBeatmap) }),