Fix scroll-into-view on control point table not working as it is supp…

…osed to
ppy · Jun 27, 2024 · 9384cbc · 9384cbc
1 parent a5aedde
commit 9384cbc
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -100,9 +100,20 @@ protected override void LoadComplete()
 
                 selectedGroup.BindValueChanged(val =>
                 {
+                    // can't use `.ScrollIntoView()` here because of the list virtualisation not giving
+                    // child items valid coordinates from the start, so ballpark something similar
+                    // using estimated row height.
                     var row = Items.FlowingChildren.SingleOrDefault(item => item.Row.Equals(val.NewValue));
-                    if (row != null)
-                        Scroll.ScrollIntoView(row);
+                    if (row == null)
+                        return;
+
+                    float minPos = Items.GetLayoutPosition(row) * row_height;
+                    float maxPos = minPos + row_height;
+
+                    if (minPos < Scroll.Current)
+                        Scroll.ScrollTo(minPos);
+                    else if (maxPos > Scroll.Current + Scroll.DisplayableContent)
+                        Scroll.ScrollTo(maxPos - Scroll.DisplayableContent);
                 });
             }
         }