IDEA-53901 Bookmarks window: "Escape" key does not work when the input is in preview pane

This commit is contained in:
Vassiliy Kudryashov
2013-03-18 21:21:16 +04:00
parent bef9fd6d2d
commit adfe5cd30a
2 changed files with 2 additions and 15 deletions
@@ -308,7 +308,7 @@ public class PopupChooserBuilder {
.setCancelCallback(myCancelCallback)
.setAlpha(myAlpha)
.setFocusOwners(myFocusOwners)
.setCancelKeyEnabled(myCancelKeyEnabled && !(myChooserComponent instanceof ListWithFilter))
.setCancelKeyEnabled(myCancelKeyEnabled)
.setAdText(myAd, myAdAlignment)
.setKeyboardActions(myKeyboardActions)
.setMayBeParent(myMayBeParent)
@@ -165,20 +165,7 @@ public class StackingPopupDispatcherImpl extends StackingPopupDispatcher impleme
} else {
popup = getFocusedPopup();
}
if (popup == null) return false;
if (closeRequest) {
if (popup.isCancelKeyEnabled()) {
popup.cancel();
return true;
}
} else {
return popup.dispatchKeyEvent(e);
}
return false;
return popup != null && popup.dispatchKeyEvent(e);
}