Fix padding and use grid container for more correctness

This commit is contained in:
Dean Herbert 2018-12-26 15:23:57 +09:00
parent 755c6b9243
commit 6e8c46f00b

View File

@ -61,14 +61,27 @@ namespace osu.Game.Screens.Multi.Match.Components
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"28242d"), Colour = OsuColour.FromHex(@"28242d"),
}, },
new GridContainer
{
RelativeSizeAxes = Axes.Both,
RowDimensions = new[]
{
new Dimension(GridSizeMode.Distributed),
new Dimension(GridSizeMode.AutoSize),
},
Content = new[]
{
new Drawable[]
{
new ScrollContainer new ScrollContainer
{ {
Padding = new MarginPadding { Vertical = 10 },
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new[] Children = new[]
{ {
new Container new Container
{ {
Padding = new MarginPadding { Top = 35, Bottom = 75, Horizontal = SearchableListOverlay.WIDTH_PADDING }, Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Children = new Drawable[] Children = new Drawable[]
@ -170,13 +183,16 @@ namespace osu.Game.Screens.Multi.Match.Components
} }
}, },
}, },
},
new Drawable[]
{
new Container new Container
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Y = 2, Y = 2,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 60, AutoSizeAxes = Axes.Y,
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
@ -186,13 +202,17 @@ namespace osu.Game.Screens.Multi.Match.Components
}, },
ApplyButton = new CreateRoomButton ApplyButton = new CreateRoomButton
{ {
Margin = new MarginPadding { Vertical = 20 },
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(230, 35), Size = new Vector2(230, 55),
Action = apply, Action = apply,
}, },
} }
} }
}
}
}
}, },
}; };