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-171743 Mac sheet dialog buttons require significant delay

Browse Source
This commit is contained in:
Denis Fokin
2017-05-16 12:20:18 +03:00
parent 5459a3b0e0
commit ffa39ab00c
2 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
+11
View File
@@ -198,6 +198,17 @@ public class SheetController implements Disposable {
});
}
void setDefaultResult () {
myResult = myDefaultButton.getName();
}
void setFocusedResult () {
if (myFocusedComponent instanceof JButton) {
JButton focusedButton = (JButton)myFocusedComponent;
myResult = focusedButton.getName();
}
}
JPanel getPanel(final JDialog w) {
w.getRootPane().setDefaultButton(myDefaultButton);
platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java
+37 -4
View File
@@ -31,10 +31,7 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.event.*;
import java.lang.ref.WeakReference;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -126,6 +123,42 @@ public class SheetMessage implements Disposable {
myWindow.setSize(myController.SHEET_NC_WIDTH, myController.SHEET_NC_HEIGHT);
setPositionRelativeToParent();
}
KeyListener animationKeyListener = new KeyListener() {
@Override
public void keyTyped(KeyEvent e) {}
@Override
public void keyPressed(KeyEvent e) {
int modifiers = e.getModifiers();
int modifiersUnion = InputEvent.SHIFT_DOWN_MASK
| InputEvent.CTRL_DOWN_MASK
| InputEvent.ALT_DOWN_MASK
| InputEvent.META_DOWN_MASK;
boolean modifiersAreNotPressed = ((modifiers & modifiersUnion) == 0);
if (modifiersAreNotPressed) {
if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
Disposer.dispose(SheetMessage.this);
}
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
myController.setDefaultResult();
Disposer.dispose(SheetMessage.this);
}
if (e.getKeyCode() == KeyEvent.VK_SPACE) {
myController.setFocusedResult();
Disposer.dispose(SheetMessage.this);
}
}
}
@Override
public void keyReleased(KeyEvent e) {}
};
Disposer.register(this, () -> myWindow.removeKeyListener(animationKeyListener));
myWindow.addKeyListener(animationKeyListener);
startAnimation(true);
if (couldBeInFullScreen()) {
FullScreenUtilities.setWindowCanFullScreen(myParent, false);