62 Commits

• 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
• SongSelectV2: Fix holding beatmap carousel previous / next traversal actions resetting position to start / end when update frame rate is low
  Bartłomiej Dach · 2025-05-28 11:45:59 +02:00
  c56c7b7239
• SongSelectV2: Fix expanded group not being persisted over filter operations
  Dean Herbert · 2025-05-28 18:15:40 +09:00
  df66bab31f
• SongSelectV2: Fix group panels being recreated every filter

  This also allows *all* panels to be re-used based on equality, as
  originally intended. Beatmap updates should be handled correctly without
  a full (flashing) recreation of panels now.

  Dean Herbert · 2025-05-28 17:46:14 +09:00
  c2bd4a9827
• SongSelectV2: Add back basic random selection support

  This is a minimal implementation in order to keep moving forward.
  
  For simplicity I've copied over the old implementation verbatim. Note
  that this is beatmap*set* based randomisation, which means that when
  panels are split up by difficulty, it is still randomising by set (with
  the difficulty choice being left up to the user recommendation system).
  I think this is what we want, but if it isn't, any changes can come
  later.

  Dean Herbert · 2025-05-28 16:54:11 +09:00
  1b56ce9a39
• Merge pull request #33288 from peppy/song-select-v2-sounds

  SongSelectV2: Add back missing song select sound effects

  Bartłomiej Dach · 2025-05-28 08:08:17 +02:00
  7926a26b0b
• Use global sample debounce period
  Dean Herbert · 2025-05-27 22:57:22 +09:00
  cc6c274d98
• Mode BDL method to proper region
  Dean Herbert · 2025-05-27 22:55:49 +09:00
  5ad1e05861
• Merge pull request #33287 from peppy/fix-selection

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

  Bartłomiej Dach · 2025-05-27 12:33:04 +02:00
  e5ba517f9c
• Add back beatmap carousel sound effects
  Dean Herbert · 2025-05-27 19:10:02 +09:00
  b01b0daf70
• Fix carousel not correctly handling traversal when current selection is filtered away

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

  Dean Herbert · 2025-05-27 18:32:56 +09:00
  046db53857
• Merge pull request #33281 from peppy/fix-switching-difficulty-split-modes

  Fix panels not updating visually when changing between difficulty sort modes

  Bartłomiej Dach · 2025-05-27 10:59:44 +02:00
  790a2f8f37
• Fix panels not updating visually when changing between difficulty sort modes

  I'm going with the simplest approach for this for now. If there's a
  discrepancy, clear all panels and start from scratch.
  
  Closes #33204.

  Dean Herbert · 2025-05-27 17:21:15 +09:00
  907d680188
• Expose ability to scroll to selected in Carousel (and handle screen-wide input to allow scrolling outside of bounds)
  Dean Herbert · 2025-05-27 15:53:32 +09:00
  a50ee3b3d2
• Add basic "eager" selection to ensure something is selected at song select after import
  Dean Herbert · 2025-05-26 19:32:32 +09:00
  4a03240ee6
• Use larger offset to ensure depth is still backmost even with DepthLayer is in use
  Dean Herbert · 2025-05-16 19:08:54 +09:00
  bfc23c98f1
• Avoid animating list tail

  At very high scroll speeds (using pageup/pagedown) you would see a weird
  animation of panels appearing. This removes the animation for that edge
  case.

  Dean Herbert · 2025-05-16 17:45:32 +09:00
  a32da2ea10
• Add new panels to carousel with a better initial Y position

  Previously, carousel panels would appear immediately at their required Y
  position. This didn't look great when they appear with other panels
  surrounding them.
  
  Now they will spawn in underneath the nearest item before them, making
  the animation feel much more correct.

  Dean Herbert · 2025-05-16 17:23:08 +09:00
  615d4accfb
• Add fade animation when carousel panels are expired

  This fixes the hard cut that was previously very jarring.

  Dean Herbert · 2025-05-16 17:21:49 +09:00
  6a2337dbea
• Fix depth flip-flopping during initial animation
  Dean Herbert · 2025-05-16 17:14:27 +09:00
  7efa724a8a
• Remove misplaced assert
  Dean Herbert · 2025-05-16 17:14:11 +09:00
  0302a37190
• Code quality fixes
  Dean Herbert · 2025-05-15 12:14:54 +03:00
  bb8d3bcf66
• Allow starting beatmap with autoplay via ctrl-enter
  Salman Alshamrani · 2025-05-15 17:01:23 +09:00
  8e7c093476
• Make carousel handle pressing enter with modifier keys
  Salman Alshamrani · 2025-05-15 16:54:14 +09:00
  87c97ad0b5
• Merge branch 'master' into full-sorting-support
  Bartłomiej Dach · 2025-05-14 14:42:29 +02:00
  a57ca72ccf
• Allow tests to accedss CarouselItems post filter operation
  Dean Herbert · 2025-05-14 19:21:57 +09:00
  8e15af2b2d
• Fix new (beatmap) carousel not correctly accounting for user scroll overrides

  The new carousel implementation was lacking some scroll related
  behaviours. This makes sure that post-filter, the selection is
  re-centered *unless* the user has scrolled away manually.
  
  This matches the old carousel's behaviour. See
  https://github.com/ppy/osu/pull/16647 for original implementation.
  
  Closes https://github.com/ppy/osu/issues/33052.

  Dean Herbert · 2025-05-14 17:32:44 +09:00
  a8d8d2d84c
• Fix exceptions being hidden by async task usage
  Dean Herbert · 2025-05-13 17:43:57 +09:00
  36317bc459