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

ui: keep selection in Keymap settings on clearing of Shortcut filter

Browse Source 
TreeExpansionMonitor does not support reentrant freezing.
So calls like:

   myTreeExpansionMonitor.freeze();
   myFilteringPanel.setShortcut(null); // triggers `filterTreeByShortcut`
   doSmth();
   myTreeExpansionMonitor.restore();

did not work as expected, because `doSmth()` was performed without
monitor state being frozen.
This commit is contained in:
Aleksey Pivovarov
2017-10-17 12:23:24 +03:00
parent c081558a38
commit 9af10f3f20
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
+3 -2
View File
@@ -330,11 +330,12 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
}
private void filterTreeByShortcut(Shortcut shortcut) {
myTreeExpansionMonitor.freeze();
boolean wasFreezed = myTreeExpansionMonitor.isFreeze();
if (!wasFreezed) myTreeExpansionMonitor.freeze();
myActionsTree.filterTree(shortcut, myQuickLists);
final JTree tree = myActionsTree.getTree();
TreeUtil.expandAll(tree);
myTreeExpansionMonitor.restore();
if (!wasFreezed) myTreeExpansionMonitor.restore();
}
public void showOption(String option) {