MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

add ability to save original shortcut even if user defined its own

Browse Source
This commit is contained in:
Konstantin Bulenkov
2016-04-14 22:03:52 +02:00
parent ec2685076c
commit a4a8b22291
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandler.java
+22 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -96,11 +96,13 @@ public class ModifierKeyDoubleClickHandler extends ApplicationComponent.Adapter
* @param actionId Id of action to be triggered on modifier+modifier[+actionKey]
* @param modifierKeyCode keyCode for modifier, e.g. KeyEvent.VK_SHIFT
* @param actionKeyCode keyCode for actionKey, or -1 if action should be triggered on bare modifier double click
* @param skipIfActionHasShortcut do not invoke action if a shortcut is already bound to it in keymap
*/
public void registerAction(@NotNull String actionId,
int modifierKeyCode,
int actionKeyCode) {
final MyDispatcher dispatcher = new MyDispatcher(actionId, modifierKeyCode, actionKeyCode);
int actionKeyCode,
boolean skipIfActionHasShortcut) {
final MyDispatcher dispatcher = new MyDispatcher(actionId, modifierKeyCode, actionKeyCode, skipIfActionHasShortcut);
MyDispatcher oldDispatcher = myDispatchers.put(actionId, dispatcher);
IdeEventQueue.getInstance().addDispatcher(dispatcher, dispatcher);
myActionManagerEx.addAnActionListener(dispatcher, dispatcher);
@@ -109,6 +111,17 @@ public class ModifierKeyDoubleClickHandler extends ApplicationComponent.Adapter
}
}
/**
* @param actionId Id of action to be triggered on modifier+modifier[+actionKey]
* @param modifierKeyCode keyCode for modifier, e.g. KeyEvent.VK_SHIFT
* @param actionKeyCode keyCode for actionKey, or -1 if action should be triggered on bare modifier double click
*/
public void registerAction(@NotNull String actionId,
int modifierKeyCode,
int actionKeyCode) {
registerAction(actionId, modifierKeyCode, actionKeyCode, true);
}
public void unregisterAction(@NotNull String actionId) {
MyDispatcher oldDispatcher = myDispatchers.remove(actionId);
if (oldDispatcher != null) {
@@ -124,16 +137,18 @@ public class ModifierKeyDoubleClickHandler extends ApplicationComponent.Adapter
private final String myActionId;
private final int myModifierKeyCode;
private final int myActionKeyCode;
private final boolean mySkipIfActionHasShortcut;
private final Couple<AtomicBoolean> ourPressed = Couple.of(new AtomicBoolean(false), new AtomicBoolean(false));
private final Couple<AtomicBoolean> ourReleased = Couple.of(new AtomicBoolean(false), new AtomicBoolean(false));
private final AtomicBoolean ourOtherKeyWasPressed = new AtomicBoolean(false);
private final AtomicLong ourLastTimePressed = new AtomicLong(0);
public MyDispatcher(@NotNull String actionId, int modifierKeyCode, int actionKeyCode) {
public MyDispatcher(@NotNull String actionId, int modifierKeyCode, int actionKeyCode, boolean skipIfActionHasShortcut) {
myActionId = actionId;
myModifierKeyCode = modifierKeyCode;
myActionKeyCode = actionKeyCode;
mySkipIfActionHasShortcut = skipIfActionHasShortcut;
}
@Override
@@ -213,7 +228,7 @@ public class ModifierKeyDoubleClickHandler extends ApplicationComponent.Adapter
return;
} else if (ourPressed.first.get() && ourReleased.first.get() && ourPressed.second.get()) {
resetState();
if (myActionKeyCode == -1 && !isActionBound()) {
if (myActionKeyCode == -1 && !shouldSkipIfActionHasShortcut()) {
run(event);
}
return;
@@ -248,8 +263,8 @@ public class ModifierKeyDoubleClickHandler extends ApplicationComponent.Adapter
}
}
private boolean isActionBound() {
return KeymapManager.getInstance().getActiveKeymap().getShortcuts(myActionId).length > 0;
private boolean shouldSkipIfActionHasShortcut() {
return mySkipIfActionHasShortcut && KeymapManager.getInstance().getActiveKeymap().getShortcuts(myActionId).length > 0;
}
@Override