1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-24 11:22:55 +08:00

Remove/fix paddings in lounge

This commit is contained in:
smoogipoo 2021-07-14 17:46:45 +09:00
parent f6b81b76e8
commit 0bfaf11d51

View File

@ -52,12 +52,32 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
RoomsContainer roomsContainer; RoomsContainer roomsContainer;
OsuScrollContainer scrollContainer; OsuScrollContainer scrollContainer;
InternalChildren = new Drawable[] InternalChild = content = new Container
{
content = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Child = new Container Child = new GridContainer
{
RelativeSizeAxes = Axes.Both,
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.Absolute, 10)
},
Content = new[]
{
new Drawable[]
{
filter = CreateFilterControl().With(d =>
{
d.RelativeSizeAxes = Axes.X;
d.Height = 80;
d.Depth = -1;
}),
},
null,
new Drawable[]
{
new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
@ -72,12 +92,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
loadingLayer = new LoadingLayer(true), loadingLayer = new LoadingLayer(true),
} }
}, },
}
}
}, },
filter = CreateFilterControl().With(d =>
{
d.RelativeSizeAxes = Axes.X;
d.Height = 80;
})
}; };
// scroll selected room into view on selection. // scroll selected room into view on selection.
@ -109,9 +126,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
content.Padding = new MarginPadding content.Padding = new MarginPadding
{ {
Top = filter.DrawHeight, Left = WaveOverlayContainer.WIDTH_PADDING,
Left = WaveOverlayContainer.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + HORIZONTAL_OVERFLOW_PADDING, Right = WaveOverlayContainer.WIDTH_PADDING,
Right = WaveOverlayContainer.WIDTH_PADDING + HORIZONTAL_OVERFLOW_PADDING,
}; };
} }