Merge pull request #2723 from mezz/pick-fix
Fix some plain keybinds not working when a modifier is active
This commit is contained in:
commit
a48fd56fdc
|
@ -22,11 +22,15 @@ public class KeyBindingMap
|
||||||
public KeyBinding lookupActive(int keyCode)
|
public KeyBinding lookupActive(int keyCode)
|
||||||
{
|
{
|
||||||
KeyModifier activeModifier = KeyModifier.getActiveModifier();
|
KeyModifier activeModifier = KeyModifier.getActiveModifier();
|
||||||
if (activeModifier.matches(keyCode))
|
if (!activeModifier.matches(keyCode))
|
||||||
{
|
{
|
||||||
activeModifier = KeyModifier.NONE;
|
KeyBinding binding = getBinding(keyCode, activeModifier);
|
||||||
|
if (binding != null)
|
||||||
|
{
|
||||||
|
return binding;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return getBinding(keyCode, activeModifier);
|
return getBinding(keyCode, KeyModifier.NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
private KeyBinding getBinding(int keyCode, KeyModifier keyModifier)
|
private KeyBinding getBinding(int keyCode, KeyModifier keyModifier)
|
||||||
|
|
Loading…
Reference in New Issue