From 258ba4674cf210b66e9ca29405b4764c5989d04e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Aug 2021 17:50:49 +0900
Subject: [PATCH] Fix background overflows

---
 osu.Game/Screens/BackgroundScreen.cs          | 18 +++++++--------
 osu.Game/Screens/BackgroundScreenStack.cs     |  4 +++-
 .../Components/RoomBackgroundScreen.cs        | 22 +++++++++++++++++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index a6fb94b151..a706934cce 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -11,6 +11,9 @@ namespace osu.Game.Screens
 {
     public abstract class BackgroundScreen : Screen, IEquatable<BackgroundScreen>
     {
+        protected const float TRANSITION_LENGTH = 500;
+        private const float x_movement_amount = 50;
+
         private readonly bool animateOnEnter;
 
         public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
@@ -27,9 +30,6 @@ namespace osu.Game.Screens
             return other?.GetType() == GetType();
         }
 
-        private const float transition_length = 500;
-        private const float x_movement_amount = 50;
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             // we don't want to handle escape key.
@@ -55,8 +55,8 @@ namespace osu.Game.Screens
                 this.FadeOut();
                 this.MoveToX(x_movement_amount);
 
-                this.FadeIn(transition_length, Easing.InOutQuart);
-                this.MoveToX(0, transition_length, Easing.InOutQuart);
+                this.FadeIn(TRANSITION_LENGTH, Easing.InOutQuart);
+                this.MoveToX(0, TRANSITION_LENGTH, Easing.InOutQuart);
             }
 
             base.OnEntering(last);
@@ -64,7 +64,7 @@ namespace osu.Game.Screens
 
         public override void OnSuspending(IScreen next)
         {
-            this.MoveToX(-x_movement_amount, transition_length, Easing.InOutQuart);
+            this.MoveToX(-x_movement_amount, TRANSITION_LENGTH, Easing.InOutQuart);
             base.OnSuspending(next);
         }
 
@@ -72,8 +72,8 @@ namespace osu.Game.Screens
         {
             if (IsLoaded)
             {
-                this.FadeOut(transition_length, Easing.OutExpo);
-                this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
+                this.FadeOut(TRANSITION_LENGTH, Easing.OutExpo);
+                this.MoveToX(x_movement_amount, TRANSITION_LENGTH, Easing.OutExpo);
             }
 
             return base.OnExiting(next);
@@ -82,7 +82,7 @@ namespace osu.Game.Screens
         public override void OnResuming(IScreen last)
         {
             if (IsLoaded)
-                this.MoveToX(0, transition_length, Easing.OutExpo);
+                this.MoveToX(0, TRANSITION_LENGTH, Easing.OutExpo);
             base.OnResuming(last);
         }
     }
diff --git a/osu.Game/Screens/BackgroundScreenStack.cs b/osu.Game/Screens/BackgroundScreenStack.cs
index 9c0c5da0fb..17894d2474 100644
--- a/osu.Game/Screens/BackgroundScreenStack.cs
+++ b/osu.Game/Screens/BackgroundScreenStack.cs
@@ -10,10 +10,12 @@ namespace osu.Game.Screens
 {
     public class BackgroundScreenStack : ScreenStack
     {
+        public const float BACKGROUND_SCALE = 1.06f;
+
         public BackgroundScreenStack()
             : base(false)
         {
-            Scale = new Vector2(1.06f);
+            Scale = new Vector2(BACKGROUND_SCALE);
             RelativeSizeAxes = Axes.Both;
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomBackgroundScreen.cs b/osu.Game/Screens/OnlinePlay/Components/RoomBackgroundScreen.cs
index efcfa35e19..393cf49bb7 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomBackgroundScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomBackgroundScreen.cs
@@ -8,6 +8,7 @@ using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Game.Online.Rooms;
 using osuTK;
 
@@ -86,5 +87,26 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             AddInternal(background = newBackground);
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // This is a static screen, so override the scale set in base.Update(), but also the scale set by the screen stack.
+            Scale = new Vector2(1f / BackgroundScreenStack.BACKGROUND_SCALE);
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            base.OnSuspending(next);
+            this.MoveToX(0, TRANSITION_LENGTH);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            var result = base.OnExiting(next);
+            this.MoveToX(0);
+            return result;
+        }
     }
 }