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

Add keyboard selection support to mod column

Browse Source
This commit is contained in:
Bartłomiej Dach
2022-02-20 14:10:35 +01:00
parent b690df05de
commit 16c6b9b3b3
2 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
@ -21,6 +22,7 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Utils;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;
#nullable enable
@ -41,6 +43,7 @@ namespace osu.Game.Overlays.Mods
}
private readonly ModType modType;
private readonly Key[]? toggleKeys;
private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
@ -55,9 +58,10 @@ namespace osu.Game.Overlays.Mods
private const float header_height = 60;
public ModColumn(ModType modType, bool allowBulkSelection)
public ModColumn(ModType modType, bool allowBulkSelection, Key[]? toggleKeys = null)
{
this.modType = modType;
this.toggleKeys = toggleKeys;
Width = 450;
RelativeSizeAxes = Axes.Y;
@ -381,5 +385,24 @@ namespace osu.Game.Overlays.Mods
}
#endregion
#region Keyboard selection support
protected override bool OnKeyDown(KeyDownEvent e)
{
if (e.ControlPressed || e.AltPressed) return false;
if (toggleKeys == null) return false;
int index = Array.IndexOf(toggleKeys, e.Key);
if (index < 0) return false;
var panel = panelFlow.ElementAtOrDefault(index);
if (panel == null || panel.Filtered.Value) return false;
panel.Active.Toggle();
return true;
}
#endregion
}
}