sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-10 08:07:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Store raw BeatmapCollection in filter control

Browse Source
This commit is contained in:
smoogipoo 2020-09-09 23:10:21 +09:00
parent af412947b2
commit 43525614ad
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
View File

@ -204,7 +204,7 @@ namespace osu.Game.Tests.Visual.SongSelect
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
AddAssert("collection filter still selected", () => control.CreateCriteria().Collection?.CollectionName.Value == "1"); AddAssert("collection filter still selected", () => control.CreateCriteria().Collection?.Name.Value == "1");
} }
private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true) private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)

2
osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Screens.Select.Carousel
} }
if (match) if (match)
match &= criteria.Collection?.ContainsBeatmap(Beatmap) ?? true; match &= criteria.Collection?.Beatmaps.Contains(Beatmap) ?? true;
Filtered.Value = !match; Filtered.Value = !match;
} }

2
osu.Game/Screens/Select/FilterControl.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Screens.Select
Sort = sortMode.Value, Sort = sortMode.Value,
AllowConvertedBeatmaps = showConverted.Value, AllowConvertedBeatmaps = showConverted.Value,
Ruleset = ruleset.Value, Ruleset = ruleset.Value,
Collection = collectionDropdown?.Current.Value Collection = collectionDropdown?.Current.Value.Collection
}; };
if (!minimumStars.IsDefault) if (!minimumStars.IsDefault)

3
osu.Game/Screens/Select/FilterCriteria.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Collections;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Screens.Select.Filter; using osu.Game.Screens.Select.Filter;
@ -56,7 +57,7 @@ namespace osu.Game.Screens.Select
/// The collection to filter beatmaps from. /// The collection to filter beatmaps from.
/// </summary> /// </summary>
[CanBeNull] [CanBeNull]
public CollectionFilter Collection; public BeatmapCollection Collection;
public struct OptionalRange<T> : IEquatable<OptionalRange<T>> public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
where T : struct where T : struct