IDEA-165089 Use blue selection for difference with a parent keymap

This commit is contained in:
Sergey Malenkov
2017-04-25 18:13:21 +03:00
parent 662e252f02
commit bb2326e8a9
3 changed files with 3 additions and 10 deletions
@@ -77,14 +77,8 @@ public class ActionsTree {
private boolean myPaintInternalInfo;
private final Map<String, String> myPluginNames = ActionsTreeUtil.createPluginActionsMap();
private final KeymapSelector myKeymapSelector;
public ActionsTree() {
this(null);
}
ActionsTree(KeymapSelector selector) {
myKeymapSelector = selector;
myRoot = new DefaultMutableTreeNode(ROOT);
myTree = new Tree(new MyModel(myRoot)) {
@@ -526,8 +520,7 @@ public class ActionsTree {
myHaveLink = false;
myLink.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
final boolean showIcons = UISettings.getInstance().getShowIconsInMenus();
Keymap parentKeymap = myKeymap == null ? null : myKeymap.getParent();
Keymap originalKeymap = myKeymapSelector == null ? parentKeymap : myKeymapSelector.getOriginalKeymap(myKeymap);
Keymap originalKeymap = myKeymap == null ? null : myKeymap.getParent();
Icon icon = null;
String text;
String actionId = null;
@@ -66,7 +66,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
private JCheckBox preferKeyPositionOverCharOption;
private final KeymapSelector myKeymapSelector = new KeymapSelector(this::currentKeymapChanged);
private final ActionsTree myActionsTree = new ActionsTree(myKeymapSelector);
private final ActionsTree myActionsTree = new ActionsTree();
private FilterComponent myFilterComponent;
private TreeExpansionMonitor myTreeExpansionMonitor;
private final ShortcutFilteringPanel myFilteringPanel = new ShortcutFilteringPanel();
@@ -250,7 +250,7 @@ final class KeymapSelector extends SimpleSchemesPanel<Keymap> implements Schemes
@Override
protected boolean highlightNonDefaultSchemes() {
return true;
return false;
}
@Override