From 29f38804156b58aee0b6f31c71a28f7dec856b17 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 12 Jun 2021 17:34:02 +0200
Subject: [PATCH] Move classes into `SettingsTextBox`

---
 .../UserInterface/OsuModSettingsNumberBox.cs  | 10 ----
 .../UserInterface/OsuModSettingsTextBox.cs    | 47 -------------------
 osu.Game/Overlays/Settings/SettingsTextBox.cs | 47 +++++++++++++++++++
 osu.Game/Rulesets/Mods/ModRandom.cs           |  5 +-
 4 files changed, 49 insertions(+), 60 deletions(-)
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuModSettingsNumberBox.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuModSettingsTextBox.cs

diff --git a/osu.Game/Graphics/UserInterface/OsuModSettingsNumberBox.cs b/osu.Game/Graphics/UserInterface/OsuModSettingsNumberBox.cs
deleted file mode 100644
index 4ec4165c0e..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuModSettingsNumberBox.cs
+++ /dev/null
@@ -1,10 +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.UserInterface
-{
-    public class OsuModSettingsNumberBox : OsuModSettingsTextBox
-    {
-        protected override bool CanAddCharacter(char character) => char.IsNumber(character);
-    }
-}
diff --git a/osu.Game/Graphics/UserInterface/OsuModSettingsTextBox.cs b/osu.Game/Graphics/UserInterface/OsuModSettingsTextBox.cs
deleted file mode 100644
index 11b7ed33d0..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuModSettingsTextBox.cs
+++ /dev/null
@@ -1,47 +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.
-
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Input.Events;
-using osuTK.Graphics;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuModSettingsTextBox : OsuTextBox
-    {
-        private const float border_thickness = 3;
-
-        private Color4 borderColourFocused;
-        private Color4 borderColourUnfocused;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
-        {
-            borderColourUnfocused = colour.Gray4.Opacity(0.5f);
-            borderColourFocused = BorderColour;
-
-            updateBorder();
-        }
-
-        protected override void OnFocus(FocusEvent e)
-        {
-            base.OnFocus(e);
-
-            updateBorder();
-        }
-
-        protected override void OnFocusLost(FocusLostEvent e)
-        {
-            base.OnFocusLost(e);
-
-            updateBorder();
-        }
-
-        private void updateBorder()
-        {
-            BorderThickness = border_thickness;
-            BorderColour = HasFocus ? borderColourFocused : borderColourUnfocused;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Settings/SettingsTextBox.cs b/osu.Game/Overlays/Settings/SettingsTextBox.cs
index 43bc8e87f8..4e96573538 100644
--- a/osu.Game/Overlays/Settings/SettingsTextBox.cs
+++ b/osu.Game/Overlays/Settings/SettingsTextBox.cs
@@ -1,8 +1,13 @@
 // 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.
 
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings
 {
@@ -14,5 +19,47 @@ namespace osu.Game.Overlays.Settings
             RelativeSizeAxes = Axes.X,
             CommitOnFocusLost = true,
         };
+
+        public class OsuModSettingsTextBox : OsuTextBox
+        {
+            private const float border_thickness = 3;
+
+            private Color4 borderColourFocused;
+            private Color4 borderColourUnfocused;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colour)
+            {
+                borderColourUnfocused = colour.Gray4.Opacity(0.5f);
+                borderColourFocused = BorderColour;
+
+                updateBorder();
+            }
+
+            protected override void OnFocus(FocusEvent e)
+            {
+                base.OnFocus(e);
+
+                updateBorder();
+            }
+
+            protected override void OnFocusLost(FocusLostEvent e)
+            {
+                base.OnFocusLost(e);
+
+                updateBorder();
+            }
+
+            private void updateBorder()
+            {
+                BorderThickness = border_thickness;
+                BorderColour = HasFocus ? borderColourFocused : borderColourUnfocused;
+            }
+        }
+
+        public class OsuModSettingsNumberBox : OsuModSettingsTextBox
+        {
+            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModRandom.cs b/osu.Game/Rulesets/Mods/ModRandom.cs
index 450b2a0680..7220580b9f 100644
--- a/osu.Game/Rulesets/Mods/ModRandom.cs
+++ b/osu.Game/Rulesets/Mods/ModRandom.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Rulesets.Mods
@@ -50,7 +49,7 @@ namespace osu.Game.Rulesets.Mods
                     }
                 }
 
-                private readonly OsuModSettingsNumberBox seedNumberBox;
+                private readonly SettingsTextBox.OsuModSettingsNumberBox seedNumberBox;
 
                 public SeedControl()
                 {
@@ -76,7 +75,7 @@ namespace osu.Game.Rulesets.Mods
                             {
                                 new Drawable[]
                                 {
-                                    seedNumberBox = new OsuModSettingsNumberBox
+                                    seedNumberBox = new SettingsTextBox.OsuModSettingsNumberBox
                                     {
                                         RelativeSizeAxes = Axes.X,
                                         CommitOnFocusLost = true