sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-20 02:38:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Re-layout to reduce movement

Browse Source
This commit is contained in:
smoogipoo 2021-02-03 14:52:36 +09:00
parent 2a4488c11b
commit 21d5f842fc
1 changed files with 54 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
View File

@ -97,18 +97,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
}, },
new Drawable[] new Drawable[]
{ {
new GridContainer new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Content = new[] Padding = new MarginPadding { Horizontal = 5, Vertical = 10 },
Child = new GridContainer
{ {
new Drawable[] RelativeSizeAxes = Axes.Both,
Content = new[]
{ {
new Container new Drawable[]
{ {
RelativeSizeAxes = Axes.Both, // Main left column
Padding = new MarginPadding { Horizontal = 5, Vertical = 10 }, new GridContainer
Child = new GridContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RowDimensions = new[] RowDimensions = new[]
@ -126,45 +127,57 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
}, },
} }
} }
} },
}, // Main right column
new FillFlowContainer new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Horizontal = 5 },
Spacing = new Vector2(0, 10),
Children = new[]
{ {
new FillFlowContainer RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new[]
{ {
RelativeSizeAxes = Axes.X, new FillFlowContainer
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{ {
new OverlinedHeader("Beatmap"), RelativeSizeAxes = Axes.X,
new BeatmapSelectionControl { RelativeSizeAxes = Axes.X } AutoSizeAxes = Axes.Y,
} Children = new Drawable[]
}, {
userModsSection = new FillFlowContainer new OverlinedHeader("Beatmap"),
{ new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
RelativeSizeAxes = Axes.X, }
AutoSizeAxes = Axes.Y, },
Children = new Drawable[] userModsSection = new FillFlowContainer
{ {
new OverlinedHeader("Extra mods"), RelativeSizeAxes = Axes.X,
new ModDisplay AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Top = 10 },
Children = new Drawable[]
{ {
DisplayUnrankedText = false, new OverlinedHeader("Extra mods"),
Current = UserMods new FillFlowContainer
}, {
new PurpleTriangleButton AutoSizeAxes = Axes.Both,
{ Direction = FillDirection.Horizontal,
RelativeSizeAxes = Axes.X, Spacing = new Vector2(10, 0),
Text = "Select", Children = new Drawable[]
Action = () => userModsSelectOverlay.Show() {
new PurpleTriangleButton
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Width = 90,
Text = "Select",
Action = () => userModsSelectOverlay.Show()
},
new ModDisplay
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
DisplayUnrankedText = false,
Current = UserMods,
Scale = new Vector2(0.8f),
},
}
}
} }
} }
} }