From 60334046e4dd7dface21e505d9ea929627993433 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 6 Mar 2022 23:57:51 +0300
Subject: [PATCH] Revert `UserTrackingScrollContainer` changes

---
 .../Containers/UserTrackingScrollContainer.cs | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
index 887aeb0c54..0561051e35 100644
--- a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public bool UserScrolling { get; private set; }
 
+        public void CancelUserScroll() => UserScrolling = false;
+
         public UserTrackingScrollContainer()
         {
         }
@@ -36,37 +38,26 @@ namespace osu.Game.Graphics.Containers
 
         protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
         {
+            UserScrolling = true;
             base.OnUserScroll(value, animated, distanceDecay);
-            OnScrollChange(true);
         }
 
         public new void ScrollIntoView(Drawable target, bool animated = true)
         {
+            UserScrolling = false;
             base.ScrollIntoView(target, animated);
-            OnScrollChange(false);
         }
 
         public new void ScrollTo(float value, bool animated = true, double? distanceDecay = null)
         {
+            UserScrolling = false;
             base.ScrollTo(value, animated, distanceDecay);
-            OnScrollChange(false);
-        }
-
-        public new void ScrollToStart(bool animated = true, bool allowDuringDrag = false)
-        {
-            base.ScrollToStart(animated, allowDuringDrag);
-            OnScrollChange(false);
         }
 
         public new void ScrollToEnd(bool animated = true, bool allowDuringDrag = false)
         {
+            UserScrolling = false;
             base.ScrollToEnd(animated, allowDuringDrag);
-            OnScrollChange(false);
         }
-
-        /// <summary>
-        /// Invoked when any scroll has been performed either programmatically or by user.
-        /// </summary>
-        protected virtual void OnScrollChange(bool byUser) => UserScrolling = byUser;
     }
 }