Merge pull request #3281 from smoogipoo/fix-rearrangeablelist-scrollt…

…otop Fix rearrangeable list scrolled to top on single item removal
ppy · Feb 18, 2020 · ae06013 · ae06013
2 parents 952fe8c + 4fd5e28
commit ae06013
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneRearrangeableListContainer.cs
@@ -227,6 +227,23 @@ public void TestRearrangeWhileRemovingItems()
             AddStep("release button", () => InputManager.ReleaseButton(MouseButton.Left));
         }
 
+        [Test]
+        public void TestNotScrolledToTopOnRemove()
+        {
+            addItems(100);
+
+            float scrollPosition = 0;
+            AddStep("scroll to item 50", () =>
+            {
+                list.ScrollTo(50);
+                scrollPosition = list.ScrollPosition;
+            });
+
+            AddStep("remove item 50", () => list.Items.Remove(50));
+
+            AddAssert("scroll hasn't changed", () => list.ScrollPosition == scrollPosition);
+        }
+
         private void addDragSteps(int from, int to, int[] expectedSequence)
         {
             AddStep($"move to {from}", () =>

diff --git a/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs b/osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
@@ -86,7 +86,8 @@ private void collectionChanged(object sender, NotifyCollectionChangedEventArgs e
 
                     // Explicitly reset scroll position here so that ScrollContainer doesn't retain our
                     // scroll position if we quickly add new items after calling a Clear().
-                    ScrollContainer.ScrollToStart();
+                    if (Items.Count == 0)
+                        ScrollContainer.ScrollToStart();
                     break;
 
                 case NotifyCollectionChangedAction.Reset: