From 5fb4f2fadf6a59aadca7052d884fd23f986ca367 Mon Sep 17 00:00:00 2001 From: iiSaLMaN Date: Wed, 19 Jun 2019 17:38:43 +0300 Subject: [PATCH 1/3] Add TOP_PADDING --- osu.Game/Overlays/BeatmapSetOverlay.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs index 1e687267a3..205909ce7d 100644 --- a/osu.Game/Overlays/BeatmapSetOverlay.cs +++ b/osu.Game/Overlays/BeatmapSetOverlay.cs @@ -24,6 +24,7 @@ namespace osu.Game.Overlays private const int fade_duration = 300; public const float X_PADDING = 40; + public const float TOP_PADDING = 25; public const float RIGHT_WIDTH = 275; private readonly Header header; From 15229f3a239fe31c3e765d18157a305ffe7cf023 Mon Sep 17 00:00:00 2001 From: iiSaLMaN Date: Wed, 19 Jun 2019 17:45:39 +0300 Subject: [PATCH 2/3] Make header expandable --- osu.Game/Overlays/BeatmapSet/Header.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs index a0f71d05c0..89b0d94783 100644 --- a/osu.Game/Overlays/BeatmapSet/Header.cs +++ b/osu.Game/Overlays/BeatmapSet/Header.cs @@ -45,7 +45,7 @@ namespace osu.Game.Overlays.BeatmapSet ExternalLinkButton externalLink; RelativeSizeAxes = Axes.X; - Height = 400; + AutoSizeAxes = Axes.Y; Masking = true; EdgeEffect = new EdgeEffectParameters @@ -72,7 +72,8 @@ namespace osu.Game.Overlays.BeatmapSet }, new Container { - RelativeSizeAxes = Axes.Both, + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y, Padding = new MarginPadding { Top = tabs_height }, Children = new Drawable[] { @@ -94,18 +95,20 @@ namespace osu.Game.Overlays.BeatmapSet }, new Container { - RelativeSizeAxes = Axes.Both, + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y, Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = BeatmapSetOverlay.X_PADDING }, Child = new FillFlowContainer { - RelativeSizeAxes = Axes.Both, + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y, Direction = FillDirection.Vertical, Children = new Drawable[] { new Container { RelativeSizeAxes = Axes.X, - Height = 113, + AutoSizeAxes = Axes.Y, Child = Picker = new BeatmapPicker(), }, new FillFlowContainer @@ -158,7 +161,7 @@ namespace osu.Game.Overlays.BeatmapSet Anchor = Anchor.BottomRight, Origin = Anchor.BottomRight, AutoSizeAxes = Axes.Both, - Margin = new MarginPadding { Right = BeatmapSetOverlay.X_PADDING }, + Margin = new MarginPadding { Top = BeatmapSetOverlay.TOP_PADDING, Right = BeatmapSetOverlay.X_PADDING }, Direction = FillDirection.Vertical, Spacing = new Vector2(10), Children = new Drawable[] From 3e285e5dde6d4ebfc177af214ea2e7027995aafe Mon Sep 17 00:00:00 2001 From: iiSaLMaN Date: Wed, 19 Jun 2019 17:47:47 +0300 Subject: [PATCH 3/3] Separate beatmap info container from details (avoid overlapping) --- osu.Game/Overlays/BeatmapSet/Header.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs index 89b0d94783..7d6a35c537 100644 --- a/osu.Game/Overlays/BeatmapSet/Header.cs +++ b/osu.Game/Overlays/BeatmapSet/Header.cs @@ -97,7 +97,13 @@ namespace osu.Game.Overlays.BeatmapSet { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = BeatmapSetOverlay.X_PADDING }, + Padding = new MarginPadding + { + Top = 20, + Bottom = 30, + Left = BeatmapSetOverlay.X_PADDING, + Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH, + }, Child = new FillFlowContainer { RelativeSizeAxes = Axes.X,