h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-07 05:43:41 +08:00
Code Issues Releases Wiki Activity

Refactor HandleFilterCompleted to (hopefully) be easier to parse

Browse Source 
This is not required to fix the issue, but it is required for my brain
to follow the method to some degress.
This commit is contained in:
Dean Herbert
2026-01-20 19:36:21 +09:00
Unverified
parent 8860eec9f9
commit 46b2d5374e
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+25 -28
View File
@@ -482,40 +482,37 @@ namespace osu.Game.Screens.SelectV2
attemptSelectSingleFilteredResult();
// Store selected group before handling selection (it may implicitly change the expanded group).
var groupForReselection = ExpandedGroup;
var currentGroupedBeatmap = CurrentSelection as GroupedBeatmap;
// The filter might have changed the set of available groups, which means that the current selection may point to a stale group.
// Check whether that is the case.
bool groupingRemainsOff = currentGroupedBeatmap?.Group == null && grouping.GroupItems.Count == 0;
bool groupStillValid = currentGroupedBeatmap?.Group != null && grouping.ItemMap.ContainsKey(currentGroupedBeatmap);
if (groupingRemainsOff || groupStillValid)
if (CurrentSelection is GroupedBeatmap selection)
{
// Update the visual state of the selected item if it should still be expanded post filter.
if (currentGroupedBeatmap != null && currentGroupedBeatmap.Group == groupForReselection)
setExpandedSet(new GroupedBeatmapSet(currentGroupedBeatmap.Group, currentGroupedBeatmap.Beatmap.BeatmapSet!));
}
else if (currentGroupedBeatmap != null)
{
// If the group no longer exists (or the item no longer exists in the previous group), grab an arbitrary other instance of the beatmap under the first group encountered.
var newSelection = GetCarouselItems()?.Select(i => i.Model).OfType<GroupedBeatmap>().FirstOrDefault(gb => gb.Beatmap.Equals(currentGroupedBeatmap.Beatmap));
// The filter might have changed the set of available groups, which means that the current selection may point to a stale group.
// Check whether that is the case.
bool groupingRemainsOff = selection.Group == null && grouping.GroupItems.Count == 0;
bool groupStillValid = selection.Group != null && grouping.ItemMap.ContainsKey(selection);
// Only change the selection if we actually got a positive hit.
// This is necessary so that selection isn't lost if the panel reappears later due to e.g. unapplying some filter criteria that made it disappear in the first place.
if (newSelection != null)
if (groupingRemainsOff || groupStillValid)
{
CurrentSelection = newSelection;
groupForReselection = newSelection.Group;
if (selection.Group == ExpandedGroup)
{
// Update the visual state of the selected item if it should still be expanded post filter.
HandleItemSelected(CurrentSelection);
}
}
else
{
// If the group no longer exists (or the item no longer exists in the previous group), grab an arbitrary other instance of the beatmap under the first group encountered.
var newSelection = GetCarouselItems()?.Select(i => i.Model).OfType<GroupedBeatmap>().FirstOrDefault(gb => gb.Beatmap.Equals(selection.Beatmap));
// Only change the selection if we actually got a positive hit.
// This is necessary so that selection isn't lost if the panel reappears later due to e.g. unapplying some filter criteria that made it disappear in the first place.
if (newSelection != null)
{
CurrentSelection = newSelection;
// have to run this here as the above operation may noop on model equality.
HandleItemSelected(CurrentSelection);
}
}
}
// If a group was selected that is not the one containing the selection, attempt to reselect it.
if (groupForReselection != null && grouping.GroupItems.TryGetValue(groupForReselection, out _))
setExpandedGroup(groupForReselection);
foreach (var item in Scroll.Panels.OfType<PanelBeatmapSet>().Where(p => p.Item != null))
updateVisibleBeatmaps((GroupedBeatmapSet)item.Item!.Model, item);
}