From f69bc23ab82a231ccd44abb9ae0115fe123bb80d Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 14 Aug 2018 17:26:25 +0900 Subject: [PATCH 1/2] Overflow mod select to account for parallax --- osu.Game/Overlays/Mods/ModSelectOverlay.cs | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs index 45703ac56d..9dd6cefc34 100644 --- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs +++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs @@ -27,6 +27,7 @@ namespace osu.Game.Overlays.Mods { public class ModSelectOverlay : WaveOverlayContainer { + private const float overflow_padding = 50; private const float content_width = 0.8f; protected Color4 LowMultiplierColour, HighMultiplierColour; @@ -199,6 +200,11 @@ namespace osu.Game.Overlays.Mods Waves.FourthWaveColour = OsuColour.FromHex(@"003a4e"); Height = 510; + Padding = new MarginPadding + { + Left = -overflow_padding, + Right = -overflow_padding + }; Children = new Drawable[] { @@ -258,6 +264,11 @@ namespace osu.Game.Overlays.Mods AutoSizeAxes = Axes.Y, Direction = FillDirection.Vertical, Width = content_width, + Padding = new MarginPadding + { + Left = overflow_padding, + Right = overflow_padding + }, Children = new Drawable[] { new OsuSpriteText @@ -295,7 +306,12 @@ namespace osu.Game.Overlays.Mods Origin = Anchor.TopCentre, Anchor = Anchor.TopCentre, RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Vertical = 10 }, + Padding = new MarginPadding + { + Vertical = 10, + Left = overflow_padding, + Right = overflow_padding + }, Child = ModSectionsContainer = new FillFlowContainer { Origin = Anchor.TopCentre, @@ -341,7 +357,9 @@ namespace osu.Game.Overlays.Mods Direction = FillDirection.Horizontal, Padding = new MarginPadding { - Vertical = 15 + Vertical = 15, + Left = overflow_padding, + Right = overflow_padding }, Children = new Drawable[] { From aa3f6337a22d2aff4a74d2175a13a70761c4c29c Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 15 Aug 2018 09:14:07 +0900 Subject: [PATCH 2/2] Add comment --- osu.Game/Overlays/Mods/ModSelectOverlay.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs index 9dd6cefc34..e83dedaf35 100644 --- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs +++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs @@ -27,7 +27,11 @@ namespace osu.Game.Overlays.Mods { public class ModSelectOverlay : WaveOverlayContainer { + /// + /// How much this container should overflow the sides of the screen to account for parallax shifting. + /// private const float overflow_padding = 50; + private const float content_width = 0.8f; protected Color4 LowMultiplierColour, HighMultiplierColour;