From 6bea744e345696926b0e0e4159b3796fa1cf6dbc Mon Sep 17 00:00:00 2001
From: Davran Dilshat <davran.dilshat@gmail.com>
Date: Mon, 23 Aug 2021 17:13:25 +0100
Subject: [PATCH] invalidate scroll position

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 8 +++-----
 osu.Game/Overlays/SettingsPanel.cs                | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index cd6d0a9432..76492cab55 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -202,8 +202,6 @@ namespace osu.Game.Graphics.Containers
             });
         }
 
-        private int lastKnownChildrenCount;
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -222,12 +220,10 @@ namespace osu.Game.Graphics.Containers
             }
 
             float currentScroll = scrollContainer.Current;
-            var presentChildren = Children.Where(c => c.IsPresent);
 
-            if (currentScroll != lastKnownScroll || presentChildren.Count() != lastKnownChildrenCount)
+            if (currentScroll != lastKnownScroll)
             {
                 lastKnownScroll = currentScroll;
-                lastKnownChildrenCount = presentChildren.Count();
 
                 // reset last clicked section because user started scrolling themselves
                 if (scrollContainer.UserScrolling)
@@ -253,6 +249,8 @@ namespace osu.Game.Graphics.Containers
 
                 float scrollCentre = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_y_centre + selectionLenienceAboveSection;
 
+                var presentChildren = Children.Where(c => c.IsPresent);
+
                 if (lastClickedSection != null)
                     SelectedSection.Value = lastClickedSection;
                 else if (Precision.AlmostBigger(0, scrollContainer.Current))
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index e4e76592d8..5589786169 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Overlays
 
                 loading.Hide();
 
-                searchTextBox.Current.BindValueChanged(term => SectionsContainer.SearchContainer.SearchTerm = term.NewValue, true);
+                searchTextBox.Current.BindValueChanged(term => SectionsContainer.SearchTerm = term.NewValue, true);
                 searchTextBox.TakeFocus();
 
                 loadSidebarButtons();