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

Add filtering support to mod column

Browse Source
This commit is contained in:
Bartłomiej Dach
2022-02-20 13:40:52 +01:00
parent fe4e4bf9c5
commit a83f96b026
3 changed files with 100 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
osu.Game/Overlays/Mods/ModColumn.cs
View File

@ -28,6 +28,18 @@ namespace osu.Game.Overlays.Mods
{
public class ModColumn : CompositeDrawable
{
private Func<Mod, bool>? filter;
public Func<Mod, bool>? Filter
{
get => filter;
set
{
filter = value;
updateFilter();
}
}
private readonly ModType modType;
private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
@ -220,9 +232,12 @@ namespace osu.Game.Overlays.Mods
LoadComponentsAsync(panels, loaded =>
{
panelFlow.ChildrenEnumerable = loaded;
foreach (var panel in panelFlow)
panel.Active.BindValueChanged(_ => updateToggleState());
updateToggleState();
updateFilter();
}, (cancellationTokenSource = new CancellationTokenSource()).Token);
}
@ -235,6 +250,8 @@ namespace osu.Game.Overlays.Mods
private readonly Queue<Action> pendingSelectionOperations = new Queue<Action>();
protected bool SelectionAnimationRunning => pendingSelectionOperations.Count > 0;
protected override void Update()
{
base.Update();
@ -260,8 +277,8 @@ namespace osu.Game.Overlays.Mods
private void updateToggleState()
{
if (toggleAllCheckbox != null && pendingSelectionOperations.Count == 0)
toggleAllCheckbox.Current.Value = panelFlow.All(panel => panel.Active.Value);
if (toggleAllCheckbox != null && !SelectionAnimationRunning)
toggleAllCheckbox.Current.Value = panelFlow.Where(panel => !panel.Filtered.Value).All(panel => panel.Active.Value);
}
/// <summary>
@ -271,7 +288,7 @@ namespace osu.Game.Overlays.Mods
{
pendingSelectionOperations.Clear();
foreach (var button in panelFlow.Where(b => !b.Active.Value))
foreach (var button in panelFlow.Where(b => !b.Active.Value && !b.Filtered.Value))
pendingSelectionOperations.Enqueue(() => button.Active.Value = true);
}
@ -282,7 +299,7 @@ namespace osu.Game.Overlays.Mods
{
pendingSelectionOperations.Clear();
foreach (var button in panelFlow.Where(b => b.Active.Value))
foreach (var button in panelFlow.Where(b => b.Active.Value && !b.Filtered.Value))
pendingSelectionOperations.Enqueue(() => button.Active.Value = false);
}
@ -349,5 +366,17 @@ namespace osu.Game.Overlays.Mods
}
#endregion
#region Filtering support
private void updateFilter()
{
foreach (var modPanel in panelFlow)
modPanel.ApplyFilter(Filter);
updateToggleState();
}
#endregion
}
}