From e13374ed238321ce495b0a8c2ca8a52646e88cae Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 13 Oct 2016 17:27:08 -0400
Subject: [PATCH] Tweak layout of beatmap groups
---
osu.Game/GameModes/Play/BeatmapGroup.cs | 28 +++++++++++++++--------
osu.Game/GameModes/Play/PlaySongSelect.cs | 1 +
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/osu.Game/GameModes/Play/BeatmapGroup.cs b/osu.Game/GameModes/Play/BeatmapGroup.cs
index 8d5ec8f274..8f0b6c6181 100644
--- a/osu.Game/GameModes/Play/BeatmapGroup.cs
+++ b/osu.Game/GameModes/Play/BeatmapGroup.cs
@@ -59,24 +59,34 @@ namespace osu.Game.GameModes.Play
{
BeatmapSet = beatmapSet;
Alpha = collapsedAlpha;
- Children = new Drawable[]
+ Children = new[]
{
- new Box
- {
- Colour = new Color4(0, 0, 0, 0.75f),
- RelativeSizeAxes = Axes.Both,
- Size = new Vector2(1),
- },
topContainer = new FlowContainer
{
Direction = FlowDirection.VerticalOnly,
- Children = new[] { new SpriteText { Text = this.BeatmapSet.Metadata.Title, TextSize = 25 } }
+ Children = new[]
+ {
+ new AutoSizeContainer
+ {
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ Colour = new Color4(0, 0, 0, 0.75f),
+ RelativeSizeAxes = Axes.Both,
+ Size = new Vector2(1),
+ },
+ new SpriteText { Text = this.BeatmapSet.Metadata.Title, TextSize = 25 }
+ }
+ }
+ }
}
};
difficulties = new FlowContainer // Deliberately not added to children
{
- Spacing = new Vector2(0, 10),
+ Margin = new MarginPadding { Top = 10 },
Padding = new MarginPadding { Left = 50 },
+ Spacing = new Vector2(0, 10),
Direction = FlowDirection.VerticalOnly,
Children = this.BeatmapSet.Beatmaps.Select(b => new BeatmapButton(this.BeatmapSet, b))
};
diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs
index 86dd38f711..3889c5c0f1 100644
--- a/osu.Game/GameModes/Play/PlaySongSelect.cs
+++ b/osu.Game/GameModes/Play/PlaySongSelect.cs
@@ -83,6 +83,7 @@ namespace osu.Game.GameModes.Play
{
Direction = FlowDirection.VerticalOnly,
Padding = new MarginPadding(25),
+ Spacing = new Vector2(0, 25),
}
}
}