From 6bf31e8f91111d762d657dd1f93dddfeb0577b2a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 23 Aug 2019 13:15:38 +0200
Subject: [PATCH] Make song select grouping & sorting filters persistent

---
 osu.Game/Configuration/OsuConfigManager.cs |  6 +++
 osu.Game/Screens/Select/FilterControl.cs   | 54 +++++++---------------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 19f46c1d6a..6ebacc642d 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -8,6 +8,7 @@ using osu.Framework.Platform;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Configuration
 {
@@ -25,6 +26,9 @@ namespace osu.Game.Configuration
             Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
             Set(OsuSetting.DisplayStarsMaximum, 10.0, 0, 10, 0.1);
 
+            Set(OsuSetting.SelectGroupingMode, GroupMode.All);
+            Set(OsuSetting.SelectSortingMode, SortMode.Title);
+
             Set(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation);
 
             Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2, 1);
@@ -150,6 +154,8 @@ namespace osu.Game.Configuration
         SaveUsername,
         DisplayStarsMinimum,
         DisplayStarsMaximum,
+        SelectGroupingMode,
+        SelectSortingMode,
         RandomSelectAlgorithm,
         ShowFpsDisplay,
         ChatDisplayHeight,
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 84e8e90f54..b97d64f013 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -29,40 +29,14 @@ namespace osu.Game.Screens.Select
 
         private readonly TabControl<GroupMode> groupTabs;
 
-        private SortMode sort = SortMode.Title;
+        public readonly Bindable<SortMode> SortMode = new Bindable<SortMode>(Filter.SortMode.Title);
 
-        public SortMode Sort
-        {
-            get => sort;
-            set
-            {
-                if (sort != value)
-                {
-                    sort = value;
-                    FilterChanged?.Invoke(CreateCriteria());
-                }
-            }
-        }
-
-        private GroupMode group = GroupMode.All;
-
-        public GroupMode Group
-        {
-            get => group;
-            set
-            {
-                if (group != value)
-                {
-                    group = value;
-                    FilterChanged?.Invoke(CreateCriteria());
-                }
-            }
-        }
+        public readonly Bindable<GroupMode> GroupMode = new Bindable<GroupMode>(Filter.GroupMode.All);
 
         public FilterCriteria CreateCriteria() => new FilterCriteria
         {
-            Group = group,
-            Sort = sort,
+            Group = GroupMode.Value,
+            Sort = SortMode.Value,
             SearchText = searchTextBox.Text,
             AllowConvertedBeatmaps = showConverted.Value,
             Ruleset = ruleset.Value
@@ -122,7 +96,7 @@ namespace osu.Game.Screens.Select
                                     Height = 24,
                                     Width = 0.5f,
                                     AutoSort = true,
-                                    Current = { Value = GroupMode.Title }
+                                    Current = GroupMode
                                 },
                                 //spriteText = new OsuSpriteText
                                 //{
@@ -141,7 +115,7 @@ namespace osu.Game.Screens.Select
                                     Width = 0.5f,
                                     Height = 24,
                                     AutoSort = true,
-                                    Current = { Value = SortMode.Title }
+                                    Current = SortMode
                                 }
                             }
                         },
@@ -151,10 +125,8 @@ namespace osu.Game.Screens.Select
 
             searchTextBox.Current.ValueChanged += _ => FilterChanged?.Invoke(CreateCriteria());
 
-            groupTabs.PinItem(GroupMode.All);
-            groupTabs.PinItem(GroupMode.RecentlyPlayed);
-            groupTabs.Current.ValueChanged += group => Group = group.NewValue;
-            sortTabs.Current.ValueChanged += sort => Sort = sort.NewValue;
+            groupTabs.PinItem(Filter.GroupMode.All);
+            groupTabs.PinItem(Filter.GroupMode.RecentlyPlayed);
         }
 
         public void Deactivate()
@@ -184,7 +156,15 @@ namespace osu.Game.Screens.Select
             showConverted.ValueChanged += _ => updateCriteria();
 
             ruleset.BindTo(parentRuleset);
-            ruleset.BindValueChanged(_ => updateCriteria(), true);
+            ruleset.BindValueChanged(_ => updateCriteria());
+
+            config.BindWith(OsuSetting.SelectGroupingMode, GroupMode);
+            config.BindWith(OsuSetting.SelectSortingMode, SortMode);
+
+            GroupMode.BindValueChanged(_ => updateCriteria());
+            SortMode.BindValueChanged(_ => updateCriteria());
+
+            updateCriteria();
         }
 
         private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());