From bdea75b99584c2624cfc9acff6fc811f332ebc07 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sat, 5 Oct 2019 23:53:05 +0300
Subject: [PATCH] Autoscroll playlist on song change

---
 osu.Game/Configuration/OsuConfigManager.cs    |  5 +++-
 osu.Game/Overlays/Music/PlaylistList.cs       | 11 +++++++-
 .../Sections/Audio/PlaylistSettings.cs        | 27 +++++++++++++++++++
 .../Settings/Sections/AudioSection.cs         |  1 +
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index c0ce08ba08..75cc961a9e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -117,6 +117,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
+
+            Set(OsuSetting.FollowPlayback, true);
         }
 
         public OsuConfigManager(Storage storage)
@@ -186,6 +188,7 @@ namespace osu.Game.Configuration
         UIScale,
         IntroSequence,
         UIHoldActivationDelay,
-        HitLighting
+        HitLighting,
+        FollowPlayback
     }
 }
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 5b528c5ab2..95b4a28125 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osuTK;
 
@@ -52,6 +53,8 @@ namespace osu.Game.Overlays.Music
 
             private IBindableList<BeatmapSetInfo> beatmaps;
 
+            private IBindable<bool> followPlayback;
+
             [Resolved]
             private MusicController musicController { get; set; }
 
@@ -76,8 +79,10 @@ namespace osu.Game.Overlays.Music
             }
 
             [BackgroundDependencyLoader]
-            private void load(IBindable<WorkingBeatmap> beatmap)
+            private void load(IBindable<WorkingBeatmap> beatmap, OsuConfigManager configManager)
             {
+                followPlayback = configManager.GetBindable<bool>(OsuSetting.FollowPlayback);
+
                 beatmaps = musicController.BeatmapSets.GetBoundCopy();
                 beatmaps.ItemsAdded += i => i.ForEach(addBeatmapSet);
                 beatmaps.ItemsRemoved += i => i.ForEach(removeBeatmapSet);
@@ -109,7 +114,11 @@ namespace osu.Game.Overlays.Music
             private void updateSelectedSet()
             {
                 foreach (PlaylistItem s in items.Children)
+                {
                     s.Selected = s.BeatmapSetInfo.ID == beatmapBacking.Value.BeatmapSetInfo?.ID;
+                    if (s.Selected && followPlayback.Value)
+                        ScrollIntoView(s);
+                }
             }
 
             public string SearchTerm
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs
new file mode 100644
index 0000000000..5de99e24af
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Audio/PlaylistSettings.cs
@@ -0,0 +1,27 @@
+// 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.Graphics;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Audio
+{
+    public class PlaylistSettings : SettingsSubsection
+    {
+        protected override string Header => "Playlist";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = "Follow playback",
+                    Bindable = config.GetBindable<bool>(OsuSetting.FollowPlayback)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/AudioSection.cs b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
index 772f5c2039..dd67493a75 100644
--- a/osu.Game/Overlays/Settings/Sections/AudioSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/AudioSection.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 new VolumeSettings(),
                 new OffsetSettings(),
                 new MainMenuSettings(),
+                new PlaylistSettings()
             };
         }
     }