diff --git a/osu.Game/GameModes/Play/BeatmapButton.cs b/osu.Game/GameModes/Play/BeatmapButton.cs index 465b41706b..e80de14380 100644 --- a/osu.Game/GameModes/Play/BeatmapButton.cs +++ b/osu.Game/GameModes/Play/BeatmapButton.cs @@ -31,7 +31,7 @@ namespace osu.Game.GameModes.Play this.beatmapSet = set; this.beatmap = beatmap; RelativeSizeAxes = Axes.X; - Size = new Vector2(1, 0); + Size = new Vector2(1, -1); Children = new Drawable[] { new Box diff --git a/osu.Game/GameModes/Play/BeatmapGroup.cs b/osu.Game/GameModes/Play/BeatmapGroup.cs index 29c01c4d18..648977dc1c 100644 --- a/osu.Game/GameModes/Play/BeatmapGroup.cs +++ b/osu.Game/GameModes/Play/BeatmapGroup.cs @@ -76,13 +76,13 @@ namespace osu.Game.GameModes.Play selectedBeatmap = beatmapSet.Beatmaps[0]; Alpha = collapsedAlpha; RelativeSizeAxes = Axes.X; - Size = new Vector2(1, 0); + Size = new Vector2(1, -1); Children = new[] { topContainer = new FlowContainer { RelativeSizeAxes = Axes.X, - Size = new Vector2(1, 0), + Size = new Vector2(1, -1), Direction = FlowDirection.VerticalOnly, Children = new[] { setBox = new BeatmapSetBox(beatmapSet, beatmapStore, resources) } } @@ -90,7 +90,7 @@ namespace osu.Game.GameModes.Play difficulties = new FlowContainer // Deliberately not added to children { RelativeSizeAxes = Axes.X, - Size = new Vector2(1, 0), + Size = new Vector2(1, -1), Margin = new MarginPadding { Top = 5 }, Padding = new MarginPadding { Left = 25 }, Spacing = new Vector2(0, 5), @@ -200,7 +200,6 @@ namespace osu.Game.GameModes.Play { Anchor = Anchor.Centre, TextSize = size, - Size = new Vector2(size), Colour = color, Icon = icon } diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index 3cbaa5d178..20c17c3bbe 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -29,10 +29,8 @@ namespace osu.Game.GameModes.Play private BeatmapInfo selectedBeatmap; private BeatmapResourceStore beatmapResources; private TextureStore beatmapTextureResources; - // TODO: use currently selected track as bg protected override BackgroundMode CreateBackground() => new BackgroundModeCustom(@"Backgrounds/bg4"); - private ScrollContainer scrollContainer; private FlowContainer setList; @@ -75,7 +73,7 @@ namespace osu.Game.GameModes.Play public PlaySongSelect() { - const float scrollWidth = 500; + const float scrollWidth = 640; Children = new Drawable[] { new Container @@ -115,21 +113,11 @@ namespace osu.Game.GameModes.Play { Padding = new MarginPadding { Left = 25, Top = 25, Bottom = 25 }, RelativeSizeAxes = Axes.X, - Size = new Vector2(1, 0), + Size = new Vector2(1, -1), Direction = FlowDirection.VerticalOnly, Spacing = new Vector2(0, 25), } } - }, - new Button - { - Text = "Play", - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - RelativePositionAxes = Axes.Both, - Position = Vector2.Zero, - Colour = new Color4(238, 51, 153, 255), - Action = () => Console.WriteLine("Clicked!"), } }; }