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

Merge branch 'master' into new-combo-toggle

Browse Source
This commit is contained in:
Dan Balasescu
2020-09-25 17:33:12 +09:00
committed by GitHub
parent 0f8551e9ea ab03be5336
commit 7b09f73fe5
11 changed files with 257 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -197,6 +197,9 @@ namespace osu.Game.Rulesets.Edit
protected override bool OnKeyDown(KeyDownEvent e)
{
if (e.ControlPressed || e.AltPressed || e.SuperPressed)
return false;
if (checkLeftToggleFromKey(e.Key, out var leftIndex))
{
var item = toolboxCollection.Items.ElementAtOrDefault(leftIndex);
@ -210,7 +213,7 @@ namespace osu.Game.Rulesets.Edit
if (checkRightToggleFromKey(e.Key, out var rightIndex))
{
var item = togglesCollection.Children[rightIndex];
var item = togglesCollection.ElementAtOrDefault(rightIndex);
if (item is SettingsCheckbox checkbox)
{