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-216720 "Ctrl+E" shortcut is displayed in "Recent Files" popup if it was removed from the keymap

Browse Source 
GitOrigin-RevId: 4aa660023e23199c674376b945eb8f879d8728e3
This commit is contained in:
Mikhail Sokolov
2020-07-14 21:03:53 +00:00
committed by intellij-monorepo-bot
parent d5cd08a74f
commit 208f64d68d
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+8 -12
View File
@@ -232,10 +232,6 @@ public final class Switcher extends AnAction implements DumbAware {
Project project = e.getProject();
e.getPresentation().setEnabledAndVisible(SWITCHER_KEY.get(project) != null);
}
static boolean isEnabled() {
return getActiveKeymapShortcuts(TOGGLE_CHECK_BOX_ACTION_ID).getShortcuts().length > 0;
}
}
public static class IterateItemsAction extends DumbAwareAction implements DumbAware {
@@ -552,9 +548,7 @@ public final class Switcher extends AnAction implements DumbAware {
myClickListener.installOn(files);
ScrollingUtil.ensureSelectionExists(files);
myShowOnlyEditedFilesCheckBox = new MyCheckBox(ToggleCheckBoxAction.isEnabled() ? TOGGLE_CHECK_BOX_ACTION_ID
: actionId,
onlyEdited);
myShowOnlyEditedFilesCheckBox = new MyCheckBox(TOGGLE_CHECK_BOX_ACTION_ID, onlyEdited);
myTopPanel = createTopPanel(myShowOnlyEditedFilesCheckBox,
isCheckboxMode() ? IdeBundle.message("title.popup.recent.files") : title,
pinned);
@@ -1407,12 +1401,14 @@ public final class Switcher extends AnAction implements DumbAware {
}
private static String layoutText(@NotNull String actionId) {
String text = "<html>" + IdeBundle.message("recent.files.checkbox.label");
ShortcutSet shortcuts = getActiveKeymapShortcuts(actionId);
return "<html>"
+ IdeBundle.message("recent.files.checkbox.label")
+ " <font color=\"" + RecentLocationsAction.Holder.SHORTCUT_HEX_COLOR + "\">"
+ KeymapUtil.getShortcutsText(shortcuts.getShortcuts()) + "</font>"
+ "</html>";
if (shortcuts.getShortcuts().length > 0) {
text += " <font color=\"" + RecentLocationsAction.Holder.SHORTCUT_HEX_COLOR + "\">"
+ KeymapUtil.getShortcutsText(shortcuts.getShortcuts()) + "</font>"
+ "</html>";
}
return text;
}
}