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-146484 vcs: history - do not register doubleclick shortcut on commit message area

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-10-20 17:16:42 +03:00
parent 4a796c6913
commit cf894e88ef
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+3 -11
View File
@@ -641,6 +641,8 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
myDualView.setCellWrapper(new MyCellWrapper(sessionGetter));
myDualView.installDoubleClickHandler(new MyDiffAction());
final TableView flatView = myDualView.getFlatView();
TableViewModel sortableModel = flatView.getTableViewModel();
sortableModel.setSortable(true);
@@ -768,19 +770,9 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
}
final MyDiffAction diffAction = new MyDiffAction();
diffAction.registerCustomShortcutSet(CommonShortcuts.getDiff(), null);
result.add(diffAction);
if (!popup) {
List<Shortcut> shortcuts = new SmartList<Shortcut>();
ContainerUtil.addAll(shortcuts, CommonShortcuts.getDiff().getShortcuts());
ContainerUtil.addAll(shortcuts, CommonShortcuts.DOUBLE_CLICK_1.getShortcuts());
CustomShortcutSet shortcutSet = new CustomShortcutSet(ContainerUtil.toArray(shortcuts, new Shortcut[shortcuts.size()]));
diffAction.registerCustomShortcutSet(shortcutSet, myDualView.getFlatView());
diffAction.registerCustomShortcutSet(shortcutSet, myDualView.getTreeView());
}
else {
diffAction.registerCustomShortcutSet(CommonShortcuts.getDiff(), this);
}
result.add(ActionManager.getInstance().getAction("Vcs.ShowDiffWithLocal"));
final AnAction diffGroup = ActionManager.getInstance().getAction(VCS_HISTORY_ACTIONS_GROUP);