Moved ScaleMode to UprightAspectMaintainingContainer.cs

osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs

@@ -119,4 +119,22 @@ namespace osu.Game.Graphics.Containers
             }
         }
     }
+
+    public enum ScaleMode
+    {
+        /// <summary>
+        /// Prevent this container from scaling.
+        /// </summary>
+        NoScaling,
+
+        /// <summary>
+        /// Scale uniformly (maintaining aspect ratio) based on the vertical scale of the parent.
+        /// </summary>
+        Vertical,
+
+        /// <summary>
+        /// Scale uniformly (maintaining aspect ratio) based on the horizontal scale of the parent.
+        /// </summary>
+        Horizontal,
+    }
 }

osu.Game/Graphics/Containers/UprightUnscaledContainer.cs

@@ -1,23 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-namespace osu.Game.Graphics.Containers
-{
-    public enum ScaleMode
-    {
-        /// <summary>
-        /// Prevent this container from scaling.
-        /// </summary>
-        NoScaling,
-
-        /// <summary>
-        /// Scale uniformly (maintaining aspect ratio) based on the vertical scale of the parent.
-        /// </summary>
-        Vertical,
-
-        /// <summary>
-        /// Scale uniformly (maintaining aspect ratio) based on the horizontal scale of the parent.
-        /// </summary>
-        Horizontal,
-    }
-}