IDEA-69073, IDEA-67288 Toolwindow toolbars "stay" after closing via mouse if toolbar buttons in popup

This commit is contained in:
Konstantin Bulenkov
2011-05-04 14:09:29 +04:00
parent 0de48936dd
commit 5eb4c96c33
@@ -906,7 +906,15 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar {
}
});
myPopup = builder.createPopup();
ActionManager.getInstance().addAnActionListener(new AnActionListener.Adapter() {
@Override
public void afterActionPerformed(AnAction action, DataContext dataContext, AnActionEvent event) {
if (myPopup != null && !myPopup.isDisposed() && myPopup.isVisible()) {
myPopup.cancel();
}
ActionManager.getInstance().removeAnActionListener(this);
}
});
Disposer.register(myPopup, popupToolbar);
myPopup.showInScreenCoordinates(this, location);