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

close navbar on modal dialogs

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-08-27 18:27:00 +04:00
parent 52351a7006
commit f77b4ad334
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java
+21 -1
View File
@@ -53,7 +53,7 @@ import java.util.List;
*/
public class NavBarListener extends WolfTheProblemSolver.ProblemListener
implements ActionListener, FocusListener, FileStatusListener, AnActionListener, FileEditorManagerListener,
PsiTreeChangeListener, ModuleRootListener, NavBarModelListener, PropertyChangeListener, KeyListener {
PsiTreeChangeListener, ModuleRootListener, NavBarModelListener, PropertyChangeListener, KeyListener, WindowFocusListener {
private static final String LISTENER = "NavBarListener";
private static final String BUS = "NavBarMessageBus";
private final NavBarPanel myPanel;
@@ -62,6 +62,7 @@ public class NavBarListener extends WolfTheProblemSolver.ProblemListener
if (panel.getClientProperty(LISTENER) != null) {
unsubscribeFrom(panel);
}
final NavBarListener listener = new NavBarListener(panel);
final Project project = panel.getProject();
panel.putClientProperty(LISTENER, listener);
@@ -77,6 +78,13 @@ public class NavBarListener extends WolfTheProblemSolver.ProblemListener
connection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, listener);
panel.putClientProperty(BUS, connection);
panel.addKeyListener(listener);
if (panel.isInFloatingMode()) {
final Window window = SwingUtilities.windowForComponent(panel);
if (window != null) {
window.addWindowFocusListener(listener);
}
}
}
static void unsubscribeFrom(NavBarPanel panel) {
@@ -315,7 +323,19 @@ public class NavBarListener extends WolfTheProblemSolver.ProblemListener
});
}
@Override
public void windowLostFocus(WindowEvent e) {
final Window window = e.getWindow();
final Window oppositeWindow = e.getOppositeWindow();
System.out.println(window);
System.out.println(oppositeWindow);
}
//---- Ignored
@Override
public void windowGainedFocus(WindowEvent e) {
}
@Override
public void keyTyped(KeyEvent e) {}
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java
+18 -4
View File
@@ -19,6 +19,7 @@ import com.intellij.ide.navigationToolbar.ui.NavBarUIManager;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Queryable;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.SystemInfo;
@@ -35,10 +36,7 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -127,6 +125,22 @@ public class NavBarPopup extends LightweightHint implements Disposable{
ListScrollingUtil.selectItem(list, myIndex);
}
}
if (myPanel.isInFloatingMode()) {
final Window window = SwingUtilities.windowForComponent(getList());
window.addWindowFocusListener(new WindowFocusListener() {
@Override
public void windowGainedFocus(WindowEvent e) {
}
@Override
public void windowLostFocus(WindowEvent e) {
final Window w = e.getOppositeWindow();
if (w != null && DialogWrapper.findInstance(w.getComponent(0)) != null) {
myPanel.hideHint();
}
}
});
}
}
@Override