h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 03:02:56 +08:00
Code Issues Releases Wiki Activity

Adjust group traversal logic to handle cases where keyboard selection redirects

Browse Source
This commit is contained in:
Dean Herbert 2025-02-04 02:55:57 +09:00
parent b5c4e3bc14
commit e454fa558c
No known key found for this signature in database
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game/Screens/SelectV2/Carousel.cs
View File

@ -377,26 +377,31 @@ namespace osu.Game.Screens.SelectV2
if (currentSelection.CarouselItem != currentKeyboardSelection.CarouselItem) if (currentSelection.CarouselItem != currentKeyboardSelection.CarouselItem)
{ {
TryActivateSelection(); TryActivateSelection();
return;
// There's a chance this couldn't resolve, at which point continue with standard traversal.
if (currentSelection.CarouselItem == currentKeyboardSelection.CarouselItem)
return;
} }
int originalIndex; int originalIndex;
int newIndex;
if (currentKeyboardSelection.Index != null) if (currentSelection.Index == null)
originalIndex = currentKeyboardSelection.Index.Value;
else if (direction > 0)
originalIndex = carouselItems.Count - 1;
else
originalIndex = 0;
int newIndex = originalIndex;
// As a second special case, if we're group selecting backwards and the current selection isn't a group,
// make sure to go back to the group header this item belongs to, so that the block below doesn't find it and stop too early.
if (direction < 0)
{ {
while (!CheckValidForGroupSelection(carouselItems[newIndex])) // If there's no current selection, start from either end of the full list.
newIndex--; newIndex = originalIndex = direction > 0 ? carouselItems.Count - 1 : 0;
}
else
{
newIndex = originalIndex = currentSelection.Index.Value;
// As a second special case, if we're group selecting backwards and the current selection isn't a group,
// make sure to go back to the group header this item belongs to, so that the block below doesn't find it and stop too early.
if (direction < 0)
{
while (!CheckValidForGroupSelection(carouselItems[newIndex]))
newIndex--;
}
} }
// Iterate over every item back to the current selection, finding the first valid item. // Iterate over every item back to the current selection, finding the first valid item.