From 09facdc83810ecd90275a8a46b6582576b2e7b7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 24 Nov 2017 18:34:20 +0900
Subject: [PATCH] Add a setting to toggle showing converted beatmaps

---
 osu.Game/Configuration/OsuConfigManager.cs        |  4 +++-
 .../Sections/Gameplay/SongSelectSettings.cs       |  7 ++++++-
 osu.Game/Screens/Select/FilterControl.cs          | 15 ++++++++++++---
 osu.Game/Screens/Select/FilterCriteria.cs         |  3 ++-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index b3e99fce06..c087a5afb7 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
             Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
 
+            Set(OsuSetting.ShowConvertedBeatmaps, true);
             Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
             Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10, 0.1);
 
@@ -112,6 +113,7 @@ namespace osu.Game.Configuration
         SnakingOutSliders,
         ShowFpsDisplay,
         ChatDisplayHeight,
-        Version
+        Version,
+        ShowConvertedBeatmaps
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
index 07a8e7464a..9875ee8004 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
@@ -17,6 +17,11 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
         {
             Children = new Drawable[]
             {
+                new SettingsCheckbox
+                {
+                    LabelText = "Show converted beatmaps",
+                    Bindable = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
+                },
                 new SettingsSlider<double, StarSlider>
                 {
                     LabelText = "Display beatmaps from",
@@ -33,7 +38,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Random beatmap selection",
                     Bindable = config.GetBindable<SelectionRandomType>(OsuSetting.SelectionRandomType),
-                },
+                }
             };
         }
 
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index e83613125b..1b86cec613 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -15,6 +15,7 @@ using osu.Game.Screens.Select.Filter;
 using Container = osu.Framework.Graphics.Containers.Container;
 using osu.Framework.Input;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select
@@ -60,6 +61,7 @@ namespace osu.Game.Screens.Select
             Group = group,
             Sort = sort,
             SearchText = searchTextBox.Text,
+            AllowConvertedBeatmaps = showConverted,
             Ruleset = ruleset
         };
 
@@ -163,17 +165,24 @@ namespace osu.Game.Screens.Select
 
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
+        private Bindable<bool> showConverted;
+
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours, OsuGame osu)
+        private void load(OsuColour colours, OsuGame osu, OsuConfigManager config)
         {
             sortTabs.AccentColour = colours.GreenLight;
 
+            showConverted = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps);
+            showConverted.ValueChanged += val => updateCriteria();
+
             if (osu != null)
                 ruleset.BindTo(osu.Ruleset);
-            ruleset.ValueChanged += val => FilterChanged?.Invoke(CreateCriteria());
+            ruleset.ValueChanged += val => updateCriteria();
             ruleset.TriggerChange();
         }
 
+        private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
+
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
 
         protected override bool OnMouseMove(InputState state) => true;
@@ -182,4 +191,4 @@ namespace osu.Game.Screens.Select
 
         protected override bool OnDragStart(InputState state) => true;
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 6c1fb1703d..c1355bfa63 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Screens.Select
         public SortMode Sort;
         public string SearchText;
         public RulesetInfo Ruleset;
+        public bool AllowConvertedBeatmaps;
 
         public void Filter(List<BeatmapGroup> groups)
         {
@@ -23,7 +24,7 @@ namespace osu.Game.Screens.Select
             {
                 var set = g.BeatmapSet;
 
-                bool hasCurrentMode = set.Beatmaps.Any(bm => bm.RulesetID == (Ruleset?.ID ?? 0));
+                bool hasCurrentMode = AllowConvertedBeatmaps || set.Beatmaps.Any(bm => bm.RulesetID == (Ruleset?.ID ?? 0));
 
                 bool match = hasCurrentMode;