136 Commits

• Fix beatmap carousel not holding selection after refilter in some cases

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

  Dean Herbert · 2025-09-10 16:37:49 +09:00
  699892c6a2
• Fix broken reselection logic

  d4b357dfa0 contains a sneaky regression.
  The previous code read:
  
      if (CurrentSelection != null && CheckModelEquality(beatmap, CurrentSelection))
  	RequestSelection(matchingNewBeatmap);
  
  and the new one reads:
  
      if (CurrentSelection is GroupedBeatmap currentBeatmapUnderGrouping)
      {
  	var candidateSelection = currentBeatmapUnderGrouping with { Beatmap = beatmap };
  	if (CheckModelEquality(candidateSelection, CurrentSelection))
  	    RequestSelection(candidateSelection);
      }
  
  The point is that we want to reselect `matchingNewBeatmap` here, not the
  old selection. The `CheckModelEquality()` check's purpose is to check
  whether *the current selection needs updating*.
  
  I'm not sure why tests just wonderfully passed despite this, but my
  suspicion is that it was because of accidental copying of realm guids
  that obscured this problem.

  Bartłomiej Dach · 2025-09-04 13:11:31 +02:00
  134f854d7b
• Ensure that matching beatmap still exists when performing replace operation in the carousel
  Bartłomiej Dach · 2025-09-04 12:44:18 +02:00
  6e5bf57fe7
• Merge pull request #34904 from bdach/local-rank-includes-unproven-scores

  Treat guest user scores & scores of unknown users as the local user's

  Dean Herbert · 2025-09-04 17:06:51 +09:00
  f1d06f796a
• Extract helper method for retrieving all user local scores
  Bartłomiej Dach · 2025-09-03 12:05:02 +02:00
  0bbad3e1cd
• Hide object-typed CurrentSelection and expose strongly-typed alternatives instead
  Bartłomiej Dach · 2025-09-03 10:24:25 +02:00
  4a7ee6fafc
• Fix rewind not working over grouping mode changes
  Bartłomiej Dach · 2025-08-29 14:42:32 +02:00
  4ffc262073
• Fix presenting individual beatmaps from main menu breaking

  In this case `CurrentSelection` is being set on the song select screen's
  `OnEntering()`, at which point grouping is not yet known.

  Bartłomiej Dach · 2025-08-29 13:45:27 +02:00
  2b52c1de0b
• Do not attempt to refresh group in current selection if grouping is not relevant
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  89492cbd81
• Fix stale group refresh logic inadvertently losing selection entirely sometimes
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  1bb24c923d
• 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 changing group mode causing CurrentSelection to retain a stale GroupDefinition
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  107e103825
• Fix carousel selection not working

  Basically, `BeatmapCarousel.CurrentSelection`, which is
  magic-object-typed, can no longer use `BeatmapInfo` directly, it now
  must also use `GroupedBeatmap`.
  
  This spills out all the way into song select because of beatmap
  selection flows that require hookup from song select.

  Bartłomiej Dach · 2025-08-29 13:25:01 +02:00
  d4b357dfa0
• Introduce new model for "beatmaps under grouping" & allow beatmaps to appear in multiple groups

  This bypasses the immediate first issue of not being able to display
  multiple instances of a beatmap on the carousel because of model
  equality being baked into the structure. It inevitably poses a bunch of
  *other* problems, but it's a start.

  Bartłomiej Dach · 2025-08-29 13:12:12 +02:00
  a84c364e44
• Make grouping by collections and rank achieved testable without involving realm
  Bartłomiej Dach · 2025-08-29 13:12:12 +02:00
  d304a31757
• Merge branch 'master' into carousel-multi-grouping-clean
  Bartłomiej Dach · 2025-08-29 10:41:46 +02:00
  51ed19cb99
• Apply suggested rename
  Bartłomiej Dach · 2025-08-29 09:58:56 +02:00
  526ee32268
• Support beatmap sets being split apart by the active group mode in beatmap carousel
  Bartłomiej Dach · 2025-08-28 13:09:08 +02:00
  8dd131f17e
• Ensure filtering also runs after local gameplay LastPlayed changes
  Dean Herbert · 2025-08-28 19:10:20 +09:00
  7e109add96
• Fix hidden beatmap state not being reflected immediately
  Dean Herbert · 2025-08-28 02:33:18 +09:00
  8a6c857719
• 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
• Avoid triggering changes when add operations are empty

  Only seems to happen in tests. I think.

  Dean Herbert · 2025-08-27 18:13:13 +09:00
  0e57ee9ba6
• Merge branch 'master' into ssv2-crash
  Salman Alshamrani · 2025-08-14 14:09:54 +03:00
  347d621437
• Remove TODO comment
  Salman Alshamrani · 2025-08-14 12:38:04 +03:00
  693c39c23b
• Revert unnecessary changes
  Dean Herbert · 2025-08-12 14:26:20 +09:00
  8239294d10
• Replace realm access with delegates
  Salman Alshamrani · 2025-08-11 19:19:52 +03:00
  f8049a8fed
• Add "Rank Achieved" grouping mode
  Salman Alshamrani · 2025-08-07 19:16:04 +09:00
  3e9df00bdc
• Provide BeatmapItemsCount in all filters to ensure we always use correct value
  Dean Herbert · 2025-08-07 18:15:52 +09:00
  eed88d7c9b
• Fix matched beatmap count not accounting grouping filter discards
  Salman Alshamrani · 2025-08-07 18:11:17 +09:00
  0e720f6ae7
• Move realm collection retrieval to exist beside beatmap retrieval for organisation
  Dean Herbert · 2025-08-01 16:27:07 +09:00
  2d748e24ec
• Add support for grouping beatmaps by collections

  Takes changes in https://github.com/ppy/osu/pull/34233 and removes *all*
  of the complexity.
  
  Supersedes and closes #34233.
  
  Contains same caveat that we can only display one beatmap once in the
  carousel; this will be addressed separately.

  Dean Herbert · 2025-08-01 16:23:26 +09:00
  c3396a93a6
• Ensure adjacent selection when currently selected beatmap(set) is deleted
  Dean Herbert · 2025-07-10 17:46:09 +09:00
  994bd4abfe
• Merge pull request #33889 from frenzibyte/source-grouping

  Add mode for grouping beatmaps by their source

  Dean Herbert · 2025-07-08 17:09:45 +09:00
  3406303060
• Tweak SSv2 navigation sfx
  Jamie Taylor · 2025-07-05 02:01:22 +09:00
  567d09209b
• Fix typo
  Bartłomiej Dach · 2025-06-30 11:03:06 +02:00
  a8e3ce9af1
• Refactor distance-between-panels implementation

  The new version wasn't really working as expected, because the Y
  position measurement only considered visible panels, while it was being
  divided over all panels (including non-expanded groups or sets).
  
  Rather than trying to divide across all panels, just choose a sane
  number for the "highest pitch" sound and work with that as a constant.

  Dean Herbert · 2025-06-30 16:21:41 +09:00
  d7b7640055
• Play error sound when random selection fails
  Dean Herbert · 2025-06-30 16:20:32 +09:00
  bf8b6754dc
• Fix random sound effect not playing correctly
  Dean Herbert · 2025-06-30 16:09:23 +09:00
  9155f566ec
• Change GroupDefinition equality to be case insensitive
  Salman Alshamrani · 2025-06-26 09:58:30 +03:00
  e06e74d84e
• Merge pull request #33773 from peppy/fix-carousel-random-not-respecting-group

  SongSelectV2: Refine random selection to currently open group (and support difficulty split panels better)

  Bartłomiej Dach · 2025-06-24 14:37:09 +02:00
  a797c46d75
• Ensure expanded group is cleared when grouping is turned off
  Bartłomiej Dach · 2025-06-24 13:38:32 +02:00
  8781901d6b
• Expand test to cover more potential weirdness and fix said weirdness
  Dean Herbert · 2025-06-24 19:21:04 +09:00
  7b6ecbd10b
• Fix potential crash when attempting random selection after changing grouping mode
  Dean Herbert · 2025-06-24 17:48:38 +09:00
  a1ec71e677
• Merge pull request #33668 from peppy/ssv2-group-key-bindings
  Bartłomiej Dach · 2025-06-19 17:35:28 +02:00
  267a6a0ac7
• SongSelectV2: Fix random selection not working as expected when displaying individual difficulties

  Previously, random selection would always be done at a *set* level. The
  final operation of a random action would be "select the user's
  recommended difficulty from this randomly selected set".
  
  This makes no sense when sets are not grouped together at song select.
  In fact, it is completely broken with the previous commit which adds
  group-isolated random support – if we're grouping by difficulty and the
  user's recommendation is not in the current group it would throw the
  user into another group unexpectedly.
  
  This fixes the issue by splitting out the random implementation into two
  separate pathways depending on the carousel display mode.

  Dean Herbert · 2025-06-19 17:29:41 +09:00
  f676206331
• SongSelectV2: Fix random button not respecting open group

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

  Dean Herbert · 2025-06-19 17:29:41 +09:00
  d200a59902
• Fix crash when random and rewind are run on the same frame
  Dean Herbert · 2025-06-16 20:17:07 +09:00
  10c07fdf50
• 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