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

IDEA-145132 [follow-up] Esc while editing push target closes the push dialog

Browse Source 
Fix it globally.
This commit is contained in:
Anton Tarasov
2016-08-31 19:25:34 +03:00
parent 196b341f42
commit 22ad327271
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java
-8
View File
@@ -62,7 +62,6 @@ public class PushLog extends JPanel implements DataProvider {
private static final String CONTEXT_MENU = "Vcs.Push.ContextMenu";
private static final String START_EDITING = "startEditing";
private static final String CANCEL_EDITING = "cancelEditing";
private final ChangesBrowser myChangesBrowser;
private final CheckboxTree myTree;
private final MyTreeCellRenderer myTreeCellRenderer;
@@ -214,13 +213,6 @@ public class PushLog extends JPanel implements DataProvider {
}
});
myTree.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), START_EDITING);
myTree.getActionMap().put(CANCEL_EDITING, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
myTree.cancelEditing();
}
});
myTree.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false), CANCEL_EDITING);
//override default tree behaviour.
myTree.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "");
MyShowCommitInfoAction showCommitInfoAction = new MyShowCommitInfoAction();
platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
+7
View File
@@ -693,6 +693,12 @@ public final class TreeUtil {
moveDown(tree);
}
});
tree.getActionMap().put("cancelEditing", new AbstractAction() {
@Override
public void actionPerformed(final ActionEvent e) {
tree.cancelEditing();
}
});
copyAction(tree, "selectLast", "selectLastChangeLead");
copyAction(tree, "selectFirst", "selectFirstChangeLead");
@@ -703,6 +709,7 @@ public final class TreeUtil {
UIUtil.maybeInstall(inputMap, "selectPrevious", KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0));
UIUtil.maybeInstall(inputMap, "selectLast", KeyStroke.getKeyStroke(KeyEvent.VK_END, 0));
UIUtil.maybeInstall(inputMap, "selectFirst", KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0));
UIUtil.maybeInstall(tree.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), "cancelEditing", KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
}
private static void copyAction(@NotNull final JTree tree, String original, String copyTo) {