sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-20 21:17:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Hook up collection filter

Browse Source
This commit is contained in:
smoogipoo 2020-09-02 20:25:36 +09:00
parent bb090a55e0
commit 9dde37fe40
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,9 @@ namespace osu.Game.Screens.Select.Carousel
match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0); match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
} }
if (match)
match &= criteria.Collection?.ContainsBeatmap(Beatmap) ?? true;
Filtered.Value = !match; Filtered.Value = !match;
} }

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

@ -51,6 +51,8 @@ namespace osu.Game.Screens.Select
} }
} }
public FilterControl.CollectionFilter Collection;
public struct OptionalRange<T> : IEquatable<OptionalRange<T>> public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
where T : struct where T : struct
{ {