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

Fix MultipleSelectionFilter not correctly handling initial selection

Browse Source
This commit is contained in:
Dean Herbert 2022-12-15 16:56:09 +09:00
parent 60c8ef3fe5
commit a7f3e13946
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -18,6 +19,7 @@ using osuTK;
namespace osu.Game.Overlays.BeatmapListing namespace osu.Game.Overlays.BeatmapListing
{ {
public partial class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>> public partial class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>>
where T : Enum
{ {
public new readonly BindableList<T> Current = new BindableList<T>(); public new readonly BindableList<T> Current = new BindableList<T>();
@ -31,7 +33,7 @@ namespace osu.Game.Overlays.BeatmapListing
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Current.BindTo(filter.Current); filter.Current.BindTo(Current);
} }
protected sealed override Drawable CreateFilter() => filter = CreateMultipleSelectionFilter(); protected sealed override Drawable CreateFilter() => filter = CreateMultipleSelectionFilter();
@ -64,6 +66,14 @@ namespace osu.Game.Overlays.BeatmapListing
foreach (var item in Children) foreach (var item in Children)
item.Active.BindValueChanged(active => toggleItem(item.Value, active.NewValue)); item.Active.BindValueChanged(active => toggleItem(item.Value, active.NewValue));
Current.BindCollectionChanged(currentChanged, true);
}
private void currentChanged(object sender, NotifyCollectionChangedEventArgs e)
{
foreach (var c in Children)
c.Active.Value = Current.Contains(c.Value);
} }
/// <summary> /// <summary>
@ -79,7 +89,10 @@ namespace osu.Game.Overlays.BeatmapListing
private void toggleItem(T value, bool active) private void toggleItem(T value, bool active)
{ {
if (active) if (active)
Current.Add(value); {
if (!Current.Contains(value))
Current.Add(value);
}
else else
Current.Remove(value); Current.Remove(value);
} }