MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

ui: fix mnemonics rendering in modal dialogs opened via context menu

Browse Source 
`FocusManager.getFocusOwner()` in such modal dialogs is being overwritten
by `FocusManager.runOnOwnContext()` from menu. This causes `repaintMnemonics`
to be called on wrong component - from parent `IdeFrameImpl`, rather than from active `DialogWrapper`.
Thus, buttons are not being properly repainted on "Alt" key press/release.
This commit is contained in:
Aleksey Pivovarov
2018-09-18 14:43:22 +03:00
parent 4e92747472
commit 838c1756be
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java
View File

@@ -14,7 +14,6 @@ import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.util.Alarm;
import com.intellij.util.containers.hash.HashMap;
import com.intellij.util.ui.JBUI;
@@ -380,7 +379,7 @@ public class DarculaLaf extends BasicLookAndFeel {
if (e instanceof KeyEvent && ((KeyEvent)e).getKeyCode() == KeyEvent.VK_ALT) {
myAltPressed = e.getID() == KeyEvent.KEY_PRESSED;
myMnemonicAlarm.cancelAllRequests();
final Component focusOwner = IdeFocusManager.findInstance().getFocusOwner();
final Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
if (focusOwner != null) {
myMnemonicAlarm.addRequest(() -> repaintMnemonics(focusOwner, myAltPressed), 10);
}