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

IDEADEV-42117 Focus does not come to menu

Browse Source
This commit is contained in:
Alexey Pegov
2009-12-25 17:07:37 +03:00
parent 192044925d
commit 43daadda08
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
+16 -11
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.ex.LayoutFocusTraversalPolicyExt;
import com.intellij.psi.PsiElement;
import com.intellij.psi.statistics.StatisticsInfo;
@@ -161,17 +162,21 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
private void cleanupUI() {
JLayeredPane layeredPane = null;
try {
// Return focus back to the previous focused component if we need to do it and
// previous focused componen is showing.
if (
myPreviouslyFocusedComponent instanceof JComponent &&
myPreviouslyFocusedComponent.isShowing()
){
final JComponent _component = (JComponent)myPreviouslyFocusedComponent;
LayoutFocusTraversalPolicyExt.setOverridenDefaultComponent(_component);
}
if (myPreviouslyFocusedComponent != null) {
myPreviouslyFocusedComponent.requestFocus();
// check if the currently focused component was changed already, so we could leave focus intact
final Component owner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
if (SwingUtilities.isDescendingFrom(owner, myTextField)) {
// Return focus back to the previous focused component if we need to do it and
// previous focused componen is showing.
if (
myPreviouslyFocusedComponent instanceof JComponent &&
myPreviouslyFocusedComponent.isShowing()
){
final JComponent _component = (JComponent)myPreviouslyFocusedComponent;
LayoutFocusTraversalPolicyExt.setOverridenDefaultComponent(_component);
}
if (myPreviouslyFocusedComponent != null) {
myPreviouslyFocusedComponent.requestFocus();
}
}
final JRootPane rootPane = myTextFieldPanel.getRootPane();