sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-17 11:37:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove/fix paddings in lounge

Browse Source
This commit is contained in:
smoogipoo 2021-07-14 17:46:45 +09:00
parent f6b81b76e8
commit 0bfaf11d51
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
View File

@ -52,32 +52,49 @@ 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,
Child = new GridContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Child = new Container RowDimensions = new[]
{ {
RelativeSizeAxes = Axes.Both, new Dimension(GridSizeMode.AutoSize),
Children = new Drawable[] new Dimension(GridSizeMode.Absolute, 10)
},
Content = new[]
{
new Drawable[]
{ {
scrollContainer = new OsuScrollContainer 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,
ScrollbarOverlapsContent = false, Children = new Drawable[]
Padding = new MarginPadding(10), {
Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested } scrollContainer = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
ScrollbarOverlapsContent = false,
Padding = new MarginPadding(10),
Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested }
},
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,
}; };
} }