From ab42fac43abe3250ece9eb306e07ad2a49db94cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Nov 2019 02:38:31 +0900
Subject: [PATCH] Improve naming

---
 .../{BackgroundMode.cs => BackgroundSource.cs}            | 4 ++--
 osu.Game/Configuration/OsuConfigManager.cs                | 4 ++--
 .../Overlays/Settings/Sections/Audio/MainMenuSettings.cs  | 8 ++++----
 osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs   | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename osu.Game/Configuration/{BackgroundMode.cs => BackgroundSource.cs} (81%)

diff --git a/osu.Game/Configuration/BackgroundMode.cs b/osu.Game/Configuration/BackgroundSource.cs
similarity index 81%
rename from osu.Game/Configuration/BackgroundMode.cs
rename to osu.Game/Configuration/BackgroundSource.cs
index 50d54f1eb2..5726e96eb1 100644
--- a/osu.Game/Configuration/BackgroundMode.cs
+++ b/osu.Game/Configuration/BackgroundSource.cs
@@ -3,9 +3,9 @@
 
 namespace osu.Game.Configuration
 {
-    public enum BackgroundMode
+    public enum BackgroundSource
     {
-        Default,
+        Skin,
         Beatmap
     }
 }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index b847f96a1f..b71463841a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
 
-            Set(OsuSetting.BackgroundMode, BackgroundMode.Default);
+            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
         }
 
         public OsuConfigManager(Storage storage)
@@ -189,6 +189,6 @@ namespace osu.Game.Configuration
         IntroSequence,
         UIHoldActivationDelay,
         HitLighting,
-        BackgroundMode
+        MenuBackgroundSource
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
index 76a6aafe45..a303f93b34 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
@@ -34,11 +34,11 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                     Bindable = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
                     Items = Enum.GetValues(typeof(IntroSequence)).Cast<IntroSequence>()
                 },
-                new SettingsDropdown<BackgroundMode>
+                new SettingsDropdown<BackgroundSource>
                 {
-                    LabelText = "Background",
-                    Bindable = config.GetBindable<BackgroundMode>(OsuSetting.BackgroundMode),
-                    Items = Enum.GetValues(typeof(BackgroundMode)).Cast<BackgroundMode>()
+                    LabelText = "Background source",
+                    Bindable = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
+                    Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
                 }
             };
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index d49751f511..095985e9d1 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Backgrounds
 
         private Bindable<User> user;
         private Bindable<Skin> skin;
-        private Bindable<BackgroundMode> mode;
+        private Bindable<BackgroundSource> mode;
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Backgrounds
         {
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
-            mode = config.GetBindable<BackgroundMode>(OsuSetting.BackgroundMode);
+            mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
 
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Backgrounds
             {
                 switch (mode.Value)
                 {
-                    case BackgroundMode.Beatmap:
+                    case BackgroundSource.Beatmap:
                         newBackground = new BeatmapBackground(beatmap.Value, backgroundName);
                         break;