175 Commits

• Fix panel expansion not being set on initial song select load (#36456)

  Closes #36445.
  
  Fixes a regression from #36404
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Eeli Ogata · 2026-01-27 14:32:51 +01:00
  2c56419fe9
• Simplify logic further and fix regressing case
  Dean Herbert · 2026-01-22 14:59:42 +09:00
  6354286452
• Refactor HandleFilterCompleted to (hopefully) be easier to parse

  This is not required to fix the issue, but it is required for my brain
  to follow the method to some degress.

  Dean Herbert · 2026-01-20 21:12:49 +09:00
  46b2d5374e
• Handle expand set logic locally rather than calling HandleItemSelected

  This avoids the implicit group expansion happening that the added code
  was attempting to fix.

  Dean Herbert · 2026-01-20 21:12:49 +09:00
  8860eec9f9
• Revert "Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them"

  This reverts commit bc4d5d07d7.

  Dean Herbert · 2026-01-20 21:12:49 +09:00
  8c86ff36a2
• Revert "Fix current beatmap set being incorrectly expanded after collapsing group with current selection"

  This reverts commit 9ba9966078.

  Dean Herbert · 2026-01-20 21:12:48 +09:00
  fdf9092f41
• Add support for showing which beatmaps in a set are currently filtered out
  Bartłomiej Dach · 2025-12-30 12:39:32 +01:00
  e07b828f30
• Revert "Expand group that current selection resides in when moving mouse to left side of song select"

  Reverts https://github.com/ppy/osu/pull/35184 as per
  https://github.com/ppy/osu/discussions/35683#discussioncomment-15034835.

  Bartłomiej Dach · 2025-11-24 13:38:53 +01:00
  a69b2cd803
• Fix song select crashing when selecting random beatmap and changing star rating filter simultaneously (#35730)

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

  Bartłomiej Dach · 2025-11-19 16:29:55 +09:00
  ef4408a73e
• 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
• Fix attempting to select beatmap which was just externally edited in song select crashing (#35676)

  Closes https://github.com/ppy/osu/issues/35651.
  
  The reproduction steps provided in the issue are too complex even. In my
  testing all you need to do is go into editor, replace the background via
  external editing, and exit out to song select; you'll immediately see
  loss of selection on the carousel, the set panel still using the old
  background, and eventually a crash when you attempt to re-select any of
  the difficulties of the edited set.
  
  `HandleItemsChanged()` - an optimisation aiming to reduce the number
  of redundant re-filters due to minor changes to realm models that aren't
  visible to the user anyway - ignoring changes to `BeatmapInfo.ID` after
  re-entering song select post-external edit meant that song select would
  retain stale beatmap models that no longer existed in the realm
  database, thus failing refetch attempts via `GetWorkingBeatmap()` or
  
  	https://github.com/ppy/osu/blob/8f6f859c15bdfc9f10d5754c254fca7b9dd9bc9b/osu.Game/Screens/SelectV2/FooterButtonOptions.cs#L56-L57

  Bartłomiej Dach · 2025-11-11 14:20:42 +09:00
  4f783f8c41
• Merge pull request #35545 from bdach/switch-active-carousel-group

  Switch active carousel group if current selection no longer exists in the previous group

  Dean Herbert · 2025-11-01 18:42:25 +09:00
  9a393f912b
• Switch active carousel group if current selection no longer exists in the previous group

  This was primarily written to fix
  https://github.com/ppy/osu/issues/35538, but also incidentally targets
  some other scenarios, such as:
  
  - When switching from artist filtering to title filtering, selection
    sometimes would stay at the group under which the selection's artist
    was filed, rather than moving to the group under which the selection's
    title is filed (in other words, the group that *the selection is
    currently under*).
  
  - When simply assigning a beatmap to a collection such that it would
    be moved out of the current group, the selection will now follow to
    the new collection's group rather than staying at its previous
    position.
  
    Whether this is desired is highly likely to be extremely situational,
    but I don't want to introduce complications unless it's absolutely
    necessary.
  
  This has a significant performance overhead because
  `CheckModelEquality()` isn't free, but it doesn't seem horrible in
  profiling.

  Bartłomiej Dach · 2025-10-30 14:54:10 +01:00
  73e05e3fae
• Fix bad performance when moving mouse to left side of song select forcibly expands group with current selection

  Calling `HandleItemActivated()` rather than its intended 'parent method'
  of `Activate()` meant that selection state was not correctly
  invalidated:
  
  	https://github.com/ppy/osu/blob/819da1bc38dbc9676f8f1ee3924bfd8d9cb50347/osu.Game/Graphics/Carousel/Carousel.cs#L157
  
  which in turn meant that carousel item Y positions would not be
  recalculated correctly after the group was expanded, which meant that
  the items would become
  
  - visible,
  - stuck to the bottom of the expanded group,
  - one on top of another.
  
  Which is not something that's going to perform well.
  
  Certified OOP moment.

  Bartłomiej Dach · 2025-10-30 13:25:38 +01:00
  ea1798d731
• Fix single filtered selection not being reselected after being filtered away

  Closes https://github.com/ppy/osu/issues/35003.
  
  Bit dodgy to use `CurrentSelectionItem` for this. Ideally I would use
  the global `Beatmap.IsDefault`, but I kind of don't want to violate the
  rule that `BeatmapCarousel` shouldn't have direct access to the global
  beatmap. And this seems to work, so... maybe fine to use until it
  doesn't?

  Bartłomiej Dach · 2025-10-27 11:13:48 +01:00
  e61ae7ab8a
• Merge branch 'master' into favourites-grouping
  Dean Herbert · 2025-10-24 22:39:14 +09:00
  763739e877
• Fix song select collection group order not matching other collection lists when certain characters are used

  Addresses https://github.com/ppy/osu/discussions/35391.
  
  See inline commentary for explanation.

  Bartłomiej Dach · 2025-10-24 09:51:34 +02:00
  6ded2e3de7
• Implement grouping by favourites

  - Closes https://github.com/ppy/osu/issues/34494.
  - Supersedes / closes https://github.com/ppy/osu/pull/34744.

  Bartłomiej Dach · 2025-10-24 08:46:34 +02:00
  14d0982b6c
• Change BeatmapCarouselFilterGrouping constructor params to required init properties
  Bartłomiej Dach · 2025-10-24 08:42:45 +02:00
  29787360ba
• 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
• Fix beatmap set not expanding post-filter if grouping was turned off after manually collapsing active group

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

  Bartłomiej Dach · 2025-10-20 09:30:02 +02:00
  594b8c1a60
• Merge branch 'master' into song-select/coloured-group-ranked-status
  Bartłomiej Dach · 2025-10-10 12:37:10 +02:00
  60544bf595
• Change the pool of available Ranked Statuses

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

  De4n · 2025-10-08 20:09:06 +03:00
  0cc2e4eaa0
• Fix carousel sometimes crashing when attempting to select next random set

  I'm not exactly sure on the reproduction scenario here, but I have had
  switching ruleset with converts disabled crash on me a few times
  today. It appears to happen sometimes when after the switch the expanded
  group no longer exists in the set mapping, because a filter just ran and
  removed that group from set of possible groups because there'd be no
  beatmaps under it.
  
  I tried to manufacture a quick test but it's not a quick one to test
  because filtering intereference is required to reproduce, I think.
  I will try again on request but I mostly just want to get this fix out
  ASAP before I finish up for the day.

  Bartłomiej Dach · 2025-10-08 15:13:00 +02:00
  7b1e3cd537
• Fix current beatmap set being incorrectly expanded after collapsing group with current selection

  Noticed in passing. See preceding commit for failure scenario.
  
  Regressed in https://github.com/ppy/osu/pull/35163.

  Bartłomiej Dach · 2025-10-08 13:42:43 +02:00
  9ba9966078
• Make initial work to create a ranked status style
  tadatomix · 2025-10-07 01:06:46 +03:00
  3dcbcb5f64
• Merge branch 'master' into song-select-reselect-group-for-selection-when-moving-left
  Dean Herbert · 2025-10-06 16:57:57 +09:00
  8a450563fd
• Expand group that current selection resides in when moving mouse to left side of song select

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

  Bartłomiej Dach · 2025-10-03 09:27:05 +02:00
  87128453d6
• 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
• Merge pull request #35126 from Joehuu/song-select-silver-terminology

  Use silver S/SS terminology when grouping by rank/grade in song select

  Bartłomiej Dach · 2025-10-01 13:30:50 +02:00
  b980183e98
• Merge pull request #35163 from bdach/carousel-stop-re-expanding-group

  Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them

  Dean Herbert · 2025-10-01 16:33:59 +09:00
  345ae29770
• Use slightly safer method of converting to string
  Bartłomiej Dach · 2025-10-01 08:50:39 +02:00
  6bf589af88
• Merge branch 'master' into song-select-silver-terminology
  Bartłomiej Dach · 2025-10-01 08:32:07 +02:00
  03455ba683
• Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them

  RFC. Closes https://github.com/ppy/osu/issues/35091.

  Bartłomiej Dach · 2025-09-30 15:24:48 +02:00
  bc4d5d07d7
• Fix song select carousel sometimes teleporting on beatmap set deletion

  Closes https://github.com/ppy/osu/issues/35010.
  
  The issue here does not reproduce consistently, and is more or less
  random in presentation. That said, using a large enough realm database
  more or less ensures that the issue will present itself (in testing on a
  large realm db, the failure rate is around ~50%).
  
  This actually regressed in https://github.com/ppy/osu/pull/34842. The
  core failure in this case is here:
  
  	https://github.com/ppy/osu/blob/fd412618dba7399b1778b0902b73ffbae21a2399/osu.Game/Screens/SelectV2/BeatmapCarousel.cs#L161
  
  The `CheckModelEquality()` call above is comparing two `BeatmapInfo`s,
  but a84c364e44 changed the
  `BeatmapInfo`-comparing path of `CheckModelEquality()` to use
  `GroupedBeatmap` instead. Due to this, `CheckModelEquality()` falls back
  to reference equality comparison for `BeatmapInfo`s. When that reference
  comparison fails, the carousel stops detecting that the current
  selection was deleted from under it correctly, and therefore the
  proximity-based selection logic never runs.
  
  Due to the human-obvious mechanism of failure and relatively easy
  manual reproduction I've decided not to try and add tests for this,
  as they are likely to take a long time to write due to the mechanism
  of failure being incorrect use of reference equality specifically. That
  said, I can try on request.

  Bartłomiej Dach · 2025-09-30 11:41:47 +02:00
  a3e09a1c31
• Adjust initial pool size for group rank displays

  11 is excessive. There can ever be at most 9 of these panels, ever,
  because there are at most 9 possible letter grades at this time (F, D,
  C, B, A, S, S+, SS, SS+).

  Bartłomiej Dach · 2025-09-29 09:42:36 +02:00
  fd412618db
• Avoid passing the same thing three times
  Bartłomiej Dach · 2025-09-29 09:42:33 +02:00
  9dc79e6f0d
• Add a new Rank Achieved panel to BeatmapCarousel.cs
  tadatomix · 2025-09-28 22:55:22 +03:00
  cf20bbbf80
• Use silver S/SS terminology when grouping by rank/grade in song select
  Joseph Madamba · 2025-09-25 14:18:41 -07:00
  ef88a3530a
• 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