RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-25 15:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into carousel-sizing

Browse Source
This commit is contained in:
Dean Herbert 2019-07-28 12:03:32 +09:00 committed by GitHub
commit 8d98b6ebd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -47,8 +47,8 @@ namespace osu.Game.Tournament.Screens.MapPool
mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
{ {
Y = 100, Y = 100,
Spacing = new Vector2(10, 20), Spacing = new Vector2(10, 10),
Padding = new MarginPadding(50), Padding = new MarginPadding(25),
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
@ -218,7 +218,7 @@ namespace osu.Game.Tournament.Screens.MapPool
{ {
mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel> mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
{ {
Spacing = new Vector2(10, 20), Spacing = new Vector2(10, 5),
Direction = FillDirection.Full, Direction = FillDirection.Full,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y AutoSizeAxes = Axes.Y