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-169849 Can't undo in Find in Path

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2017-05-04 21:56:03 +03:00
parent 056fa05d85
commit 5828214edb
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
-1
View File
@@ -173,7 +173,6 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider {
.setResizable(true)
.setMayBeParent(true)
.setCancelOnClickOutside(true)
.setModalContext(false)
.setRequestFocus(true)
.setCancelCallback(() -> {
if (!myCanClose.get()) return false;
platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
+6 -13
View File
@@ -250,6 +250,11 @@ public final class IdeKeyEventDispatcher implements Disposable {
* @throws IllegalArgumentException if {@code component} is {@code null}.
*/
public static boolean isModalContext(@NotNull Component component) {
JBPopup popup = component instanceof JComponent ? (JBPopup)((JComponent)component).getRootPane().getClientProperty(JBPopup.KEY) : null;
if (popup != null) {
return popup.isModalContext();
}
Window window = UIUtil.getWindow(component);
if (window instanceof IdeFrameImpl) {
@@ -271,19 +276,7 @@ public final class IdeKeyEventDispatcher implements Disposable {
return false;
}
boolean isFloatingDecorator = window instanceof FloatingDecorator;
boolean isPopup = !(component instanceof JFrame) && !(component instanceof JDialog);
if (isPopup) {
if (component instanceof JWindow) {
JBPopup popup = (JBPopup)((JWindow)component).getRootPane().getClientProperty(JBPopup.KEY);
if (popup != null) {
return popup.isModalContext();
}
}
}
return !isFloatingDecorator;
return !(window instanceof FloatingDecorator);
}
private boolean inWaitForSecondStrokeState() {