osu-lazer

Fix song select carousel state capture

Closes #36776.

Dean Herbert · 2026-03-03 15:36:46 +09:00

b0759ff34d

Fix song select navigation with page up/down (#36293 )

Resolves #36099 

This PR fixes keyboard navigation in the beatmap select carousel for
lazer by implementing page-wise traversal with the Page Up and Page Down
keys and changing it from only scrolling to actually selecting items.

**Changes:**
- Added handling for `TraversalType.Page` in the keyboard traversal
switch.
- Implemented `traverseKeyboardPage(int direction)` method to move the
selection by approximately one "page" of visible items, accounting for
partially obscured items like the search bar. Also it does not wrap
around (like the current PageUp/Down functionality).
- Added new key bindings:
    - `PageUp` → SelectPreviousPage
    - `PageDown` → SelectNextPage

The code may be very explicit for the scroll logic with the page keys,
so I would appreciate some feedback when the PR is reviewed.
The naming of the keybinds may need to be adjusted. `Next page` and
`previous page` may be somewhat misleading.

**Behavior after the change:**
- Pressing Page Up/Down now moves the selection by a page of items.
- After navigating, pressing Left/Right selects the navigated song
instead of moving relative to the previous position.

**See:**
https://www.youtube.com/watch?v=JXmKAhhKiCc

---------

Signed-off-by: Linus Genz <linuslinuxgenz@gmail.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>

Linus Genz · 2026-03-02 02:08:19 +09:00

033e13cb3b

Fix carousel items becoming incorrectly selected due to bindable leakage (#36414 )

As discussed in discord. Fixed from multiple angles.

---------

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

Dean Herbert · 2026-01-22 01:06:40 +09:00

10dc1314f6

Alleviate song select post-filter update thread hitches by caching a model-to-carousel-item mapping (#35628 )

Bartłomiej Dach · 2025-11-13 23:21:14 +09:00

b64abbf1f5

SongSelectV2: Scroll to selection instantly after a filter

Closes https://github.com/ppy/osu/issues/33379.

Pretty sure this matches song select V1. The two call sites where the
old one does instant scrolls are:

	https://github.com/ppy/osu/blob/30412ba3f2c5b6debb9a0e3b930da6cc156852db/osu.Game/Screens/Select/BeatmapCarousel.cs#L672

which happens just after a filter, and

	https://github.com/ppy/osu/blob/30412ba3f2c5b6debb9a0e3b930da6cc156852db/osu.Game/Screens/Select/BeatmapCarousel.cs#L683

which is a bit more difficult to pin down, but generally appears to
happen on changes to the visible items, which on `SongSelectV2` triggers
a re-filter anyway.

Bartłomiej Dach · 2025-10-24 13:24:47 +02:00

819da1bc38

Fix performance overhead when computing spacing between standalone panels

The equality check that was supposed to replace the read of
`CurrentSelectionItem` showed up as a hotspot in profiling.

The selection updating code looks a little stupid after this, but all in
the name of performance...

Bartłomiej Dach · 2025-10-22 11:46:34 +02:00

c34b2ffc05

Attempt to scroll carousel to nearest expanded panel when the current selection is filtered out

Addresses https://github.com/ppy/osu/issues/33443, maybe.

I considered adding tests but they'd likely be janky and take a long
time to write, so decided against until there's a demand for it.

Bartłomiej Dach · 2025-10-02 14:28:39 +02:00

007de10e2b

Fix pressing Enter not starting current global beatmap if carousel is fully filtered out

Closes https://github.com/ppy/osu/issues/34693.

Bartłomiej Dach · 2025-10-01 14:31:48 +02:00

9b78187d29

Add half-height-of-selected-panel adjustment to carousel scroll target

Intended to address https://github.com/ppy/osu/issues/35147, maybe?

The old carousel would target the vertical center of the active panel
when scrolling:

	https://github.com/ppy/osu/blob/b9e1b6969e78dfa798bb4afed8afae55e9e4adb1/osu.Game/Screens/Select/BeatmapCarousel.cs#L948

This was not in place in the new carousel, weirdly, which was targeting
the top-left corner of the selected panel.

Bartłomiej Dach · 2025-09-30 12:57:24 +02:00

2edd49d2c0

Adjust matchmaking naming, namespaces, xmldoc (#35123 )

* Adjust matchmaking naming, namespaces, xmldoc

* Change partial filenames to use `.` instead of `_` separator

Dean Herbert · 2025-09-26 12:17:28 +09:00

e1ba1b45b0

Hide object-typed CurrentSelection and expose strongly-typed alternatives instead

Bartłomiej Dach · 2025-09-03 10:24:25 +02:00

4a7ee6fafc

Allow BeatmapCarousel.CurrentSelection to accept raw BeatmapInfos (and redirect to appropriate grouped beatmap)

This is probably where things get a little controversial.

There are some song select flows wherein song select just wants to
ensure sanity by authoritatively setting the global beatmap. The goal is
to change the beatmap immediately and instantly. Therefore it should
kind of be the carousel's job to figure out its grouping complications.

To that end, `CurrentSelection` is made virtual, and overridden in
`BeatmapCarousel` to perform a sort of reconciliation logic. If an
external component sets `CurrentSelection` to a `BeatmapInfo`, one of
the two following things happen:

- Nothing, if the current `GroupedBeatmap` is already a copy of the
  beatmap that needs to be selected, or

- The carousel looks at its items, finds any first copy which matches
  the beatmap that the external consumer wanted selected, and changes
  selection to that instead.

Bartłomiej Dach · 2025-08-29 13:25:08 +02:00

dfed564bda

Fix beatmap carousel re-filtering when it doesn't need to

Local rules ensure we only handle callbacks when we need to.

Dean Herbert · 2025-08-27 18:21:19 +09:00

be6fb9aa77

Add test coverage ensuring filtering does not occur on unnecessary updates

Dean Herbert · 2025-08-27 18:13:12 +09:00

043235fed2

Fix "reveal background" triggering in one more case it shouldn't

Closes https://github.com/ppy/osu/issues/34393 again. Hopefully for the
last time.

Dean Herbert · 2025-08-12 17:20:35 +09:00

086cdce94d

Fix keyboard selection being reset/invalidated more often than required

Dean Herbert · 2025-08-12 16:02:03 +09:00

71d8873cb3

Provide BeatmapItemsCount in all filters to ensure we always use correct value

Dean Herbert · 2025-08-07 18:15:52 +09:00

eed88d7c9b

Remove outdated comment

Dean Herbert · 2025-08-07 18:15:37 +09:00

dc4fb86e8b

Expand scrollbar input area for song select carousel

Dean Herbert · 2025-07-25 17:24:26 +09:00

b63ba67921

Ensure adjacent selection when currently selected beatmap(set) is deleted

Dean Herbert · 2025-07-10 17:46:09 +09:00

994bd4abfe

Tweak SSv2 navigation sfx

Jamie Taylor · 2025-07-05 02:01:22 +09:00

567d09209b

Update existing tests to work with Song Select v2

Dean Herbert · 2025-07-01 17:25:38 +09:00

397b9b3994

Update group traversal logic to use new debouncing flow

Dean Herbert · 2025-06-20 18:08:30 +09:00

131b3f622e

Merge branch 'master' into fix-another-case-of-keyboard-weird

Dean Herbert · 2025-06-20 02:16:54 +09:00

0e34752e5f

Merge pull request #33668 from peppy/ssv2-group-key-bindings

Bartłomiej Dach · 2025-06-19 17:35:28 +02:00

267a6a0ac7

Remove unused second parameter

Dean Herbert · 2025-06-19 23:52:11 +09:00

116463e30d

Remove noisy carousel logging

Served its purpose, no longer required.

Dean Herbert · 2025-06-19 18:44:22 +09:00

cb90dee3e8

SongSelectV2: Fix pressing multiple traversal keys in same frame causing weirdness

Closes #33453.

Dean Herbert · 2025-06-19 18:30:57 +09:00

6350e6d1a7

Refactor group deselection logic to avoid adding complexity to traverseSelection

Dean Herbert · 2025-06-19 17:49:11 +09:00

10132f19aa

Fix group toggle not working as expected anymore

Dean Herbert · 2025-06-17 23:15:17 +09:00

b74db44fde

Fix group selection acting weirdly when only one group is present

Dean Herbert · 2025-06-17 22:39:51 +09:00

27d4ad7991

Add support for toggling current group expansion using shift-enter

Closes https://github.com/ppy/osu/issues/33617.

Dean Herbert · 2025-06-12 20:36:02 +09:00

52ba22ca1f

Add support for traversing between groups using shift-left/right

Closes https://github.com/ppy/osu/issues/33599.

Dean Herbert · 2025-06-12 20:36:02 +09:00

3816c5d95f

Move and rename next/previous "group" selection keybindings to make way for group-specific bindings

Dean Herbert · 2025-06-11 21:02:52 +09:00

b9e1b6969e

Add back scrollbar padding in new beatmap carousel

Closes https://github.com/ppy/osu/issues/33447. Implementation copied
from previous carousel.

Dean Herbert · 2025-06-11 16:34:04 +09:00

cfd73cc900

Fix incorrect equality check

Dean Herbert · 2025-06-10 21:58:43 +09:00

b16cb1ae58

Allow changing difficulties using up and down arrows when sets are grouped

Dean Herbert · 2025-06-10 13:06:30 +09:00

cc150faf81

Use equality when updated current carousel selection

Dean Herbert · 2025-06-06 23:20:38 +09:00

6ab9ee76b7

Merge pull request #33373 from peppy/song-select-v2-more-sane-input-padding

SongSelectV2: Store input padding adjustments in `CarouselItem` to allow more reliable inflation

Bartłomiej Dach · 2025-06-04 07:41:18 +02:00

3624c251a2

Fix negative input lenience being applied to overlapping panels

Bartłomiej Dach · 2025-06-03 14:28:41 +02:00

ad251d701e

Fix unstable y positions when panels are displayed on scroll

Dean Herbert · 2025-06-03 01:15:48 +09:00

e2bbe49ca0

Store input padding adjustments in CarouselItem to allow more reliable inflation

Dean Herbert · 2025-06-02 19:11:47 +09:00

90b9fb0809

Delay scroll to after children update

Without it the layout height set does not take effect for the scroll to
correctly execute.

Bartłomiej Dach · 2025-05-30 14:49:03 +02:00

b6fa9c9dca

Fix selection's carousel Y position being read too early

`updateItemYPosition()` mutates `item.CarouselYPosition`, so storing
that to the selections before it's updated is storing stale values.

Bartłomiej Dach · 2025-05-30 14:49:03 +02:00

a3db764008

Fix scroll layout height not being set early enough

Because of this it was possible for a scroll to not be able to scroll
to the panel it wanted to scroll to because its layout height was
too small for the target Y position of the panel that it wanted to
scroll to.

The scroll height was set in `updateDisplayedRange()` which is notably
after attempting to scroll to the current selection.

Bartłomiej Dach · 2025-05-30 14:49:00 +02:00

b6335e9847

Merge branch 'master' into song-select-v2-scroll-to-selected

Bartłomiej Dach · 2025-05-30 14:27:38 +02:00

735244fb8d

Fix carousel never displaying if too many beatmap updates are arriving in background

Dean Herbert · 2025-05-30 19:39:50 +09:00

5e397d9d1f

Fix missing ConfigureAwait causing Items to potentially be copied on non-update thread

Dean Herbert · 2025-05-30 19:39:49 +09:00

7025c2cf2f

Merge pull request #33332 from peppy/song-select-v2-fix-double-filter

SongSelectV2: Fix carousel filtering twice on entering song select

Bartłomiej Dach · 2025-05-30 12:29:32 +02:00

559ddd1ec9

Merge pull request #33335 from bdach/song-select-v2-single-items-arent-shown

Dean Herbert · 2025-05-30 19:29:15 +09:00

8cea1e2e1d

100 Commits