86 Commits

• 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
• 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
• Merge branch 'master' into song-select-v2-fix-incorrect-gameplay-start
  Bartłomiej Dach · 2025-05-30 11:40:28 +02:00
  74c7d6603c
• Merge branch 'master' into song-select-v2-single-items-arent-shown
  Bartłomiej Dach · 2025-05-30 11:38:06 +02:00
  e4cd8bcc59
• SongSelectV2: Fix carousel not displaying anything if there is only one panel to display

  If there is only one panel to display, a `DisplayRange` of (0, 0) is
  *very much* valid.

  Bartłomiej Dach · 2025-05-30 11:20:00 +02:00
  2d900c55cf
• Add failing test showing double filter on entering song select
  Dean Herbert · 2025-05-30 16:03:31 +09:00
  666d9b153c
• Fix carousel activating selection when only one valid item in list
  Dean Herbert · 2025-05-30 15:50:20 +09:00
  b050e025dc
• Separate active standalone beatmap panels from the carousel vertically
  Dean Herbert · 2025-05-30 02:20:39 +09:00
  6fbc9e4580
• SongSelectV2: Fix scroll to selected not always scrolling

  I'm having trouble finding a repro for this, but I know it's been an
  ongoing issue. I've had this patch applied locally for a while now and
  haven't run into a failed scroll to selection with it.

  Dean Herbert · 2025-05-29 21:01:22 +09:00
  250fb4f2e4
• Merge branch 'master' into song-select-v2-random
  Dean Herbert · 2025-05-28 20:06:50 +09:00
  0b527ce14b
• Merge pull request #33301 from peppy/remember-group-expansion

  SongSelectV2: Fix expanded group not being persisted over filter operations

  Bartłomiej Dach · 2025-05-28 12:55:23 +02:00
  d9d74696df
• Merge pull request #33303 from bdach/song-select-v2-holding-traversal-resets-to-start-end

  SongSelectV2: Fix holding beatmap carousel previous / next traversal actions resetting position to start / end when update frame rate is low

  Dean Herbert · 2025-05-28 19:39:18 +09:00
  13f0f6d7bf
• Fix difficulty grouping not working with random
  Dean Herbert · 2025-05-28 12:14:27 +02:00
  dca839211c