fix close button [r=peter] (cherry picked from commit 0b7ed57)

This commit is contained in:
Konstantin Bulenkov
2012-03-21 16:16:57 +01:00
parent 1a0cae257f
commit 6ebca4147b
2 changed files with 12 additions and 6 deletions
@@ -188,9 +188,9 @@ public abstract class ToolWindowHeader extends JPanel implements Disposable {
});
addMouseListener(new MouseAdapter() {
public void mousePressed(final MouseEvent e) {
public void mouseReleased(final MouseEvent e) {
if (!e.isPopupTrigger()) {
if (UIUtil.isCloseClick(e)) {
if (UIUtil.isCloseClick(e, MouseEvent.MOUSE_RELEASED)) {
if (e.isAltDown()) {
toolWindow.fireHidden();
}
@@ -307,14 +307,20 @@ public class ToolWindowContentUi extends JPanel implements ContentUI, PropertyCh
myLastPoint[0] = e.getPoint();
SwingUtilities.convertPointToScreen(myLastPoint[0], c);
if (!e.isPopupTrigger()) {
if (UIUtil.isCloseClick(e)) {
ui.processHide(e);
}
else {
if (!UIUtil.isCloseClick(e)) {
ui.myWindow.fireActivated();
}
}
}
@Override
public void mouseReleased(MouseEvent e) {
if (!e.isPopupTrigger()) {
if (UIUtil.isCloseClick(e, MouseEvent.MOUSE_RELEASED)) {
ui.processHide(e);
}
}
}
});