h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-28 15:10:26 +08:00
Code Issues Releases Wiki Activity

Fix carousel not correctly handling traversal when current selection is filtered away

Browse Source 
Closes https://github.com/ppy/osu/issues/33215.
This commit is contained in:
Dean Herbert
2025-05-27 18:17:22 +09:00
Unverified
parent 8ccd6a4e4a
commit 046db53857
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Graphics/Carousel/Carousel.cs
+9 -8
View File
@@ -518,19 +518,20 @@ namespace osu.Game.Graphics.Carousel
// Position transfer won't happen unless we invalidate this.
displayedRange = null;
// The case where no items are available for display yet.
Selection prevKeyboard = currentKeyboardSelection;
// Importantly, we also reset the `Selection` to the most basic state.
// Removing the index and carousel item here is important to ensure we are aware of if a selection has been filtered away.
// If it hasn't been filtered, the full details will be re-populated just below in the loop.
currentKeyboardSelection = new Selection(currentKeyboardSelection.Model);
currentSelection = new Selection(currentSelection.Model);
if (carouselItems == null)
{
currentKeyboardSelection = new Selection();
currentSelection = new Selection();
return;
}
CarouselItem? lastVisible = null;
int count = carouselItems.Count;
Selection prevKeyboard = currentKeyboardSelection;
// We are performing two important operations here:
// - Update all Y positions. After a selection occurs, panels may have changed visibility state and therefore Y positions.
// - Link selected models to CarouselItems. If a selection changed, this is where we find the relevant CarouselItems for further use.
@@ -549,7 +550,7 @@ namespace osu.Game.Graphics.Carousel
// If a keyboard selection is currently made, we want to keep the view stable around the selection.
// That means that we should offset the immediate scroll position by any change in Y position for the selection.
if (prevKeyboard.YPosition != null && currentKeyboardSelection.YPosition != prevKeyboard.YPosition)
if (prevKeyboard.YPosition != null && currentKeyboardSelection.YPosition != null && currentKeyboardSelection.YPosition != prevKeyboard.YPosition)
Scroll.OffsetScrollPosition((float)(currentKeyboardSelection.YPosition!.Value - prevKeyboard.YPosition.Value));
}