sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move chat to right column in multiplayer match screen

Browse Source
This commit is contained in:
Dean Herbert
2021-08-19 19:02:31 +09:00
parent 675e2e34ba
commit be77498044
1 changed files with 47 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,79 +141,67 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
// Spacer // Spacer
null, null,
// Main right column // Main right column
new FillFlowContainer new GridContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.Both,
AutoSizeAxes = Axes.Y, Content = new[]
Children = new[]
{ {
new FillFlowContainer new Drawable[] { new OverlinedHeader("Beatmap") },
new Drawable[] { new BeatmapSelectionControl { RelativeSizeAxes = Axes.X } },
new[]
{ {
RelativeSizeAxes = Axes.X, UserModsSection = new FillFlowContainer
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{ {
new OverlinedHeader("Beatmap"), RelativeSizeAxes = Axes.X,
new BeatmapSelectionControl { RelativeSizeAxes = Axes.X } AutoSizeAxes = Axes.Y,
} Margin = new MarginPadding { Top = 10 },
}, Children = new Drawable[]
UserModsSection = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Top = 10 },
Children = new Drawable[]
{
new OverlinedHeader("Extra mods"),
new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, new OverlinedHeader("Extra mods"),
Direction = FillDirection.Horizontal, new FillFlowContainer
Spacing = new Vector2(10, 0),
Children = new Drawable[]
{ {
new UserModSelectButton AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(10, 0),
Children = new Drawable[]
{ {
Anchor = Anchor.CentreLeft, new UserModSelectButton
Origin = Anchor.CentreLeft, {
Width = 90, Anchor = Anchor.CentreLeft,
Text = "Select", Origin = Anchor.CentreLeft,
Action = ShowUserModSelect, Width = 90,
}, Text = "Select",
new ModDisplay Action = ShowUserModSelect,
{ },
Anchor = Anchor.CentreLeft, new ModDisplay
Origin = Anchor.CentreLeft, {
Current = UserMods, Anchor = Anchor.CentreLeft,
Scale = new Vector2(0.8f), Origin = Anchor.CentreLeft,
}, Current = UserMods,
} Scale = new Vector2(0.8f),
},
}
},
} }
} },
} },
new Drawable[] { new OverlinedHeader("Chat") { Margin = new MarginPadding { Vertical = 5 }, }, },
new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
},
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.AutoSize),
new Dimension(),
} }
} },
} }
} }
} }
} }
}, },
new Drawable[]
{
new GridContainer
{
RelativeSizeAxes = Axes.Both,
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize)
},
Content = new[]
{
new Drawable[] { new OverlinedHeader("Chat") },
new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
}
}
}
}, },
}; };