From 6ebca4147baa1cce40e2755a3f39fcef5aa5c7ca Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 21 Mar 2012 16:16:57 +0100
Subject: [PATCH] fix close button [r=peter] (cherry picked from commit
 0b7ed57)

---
 .../intellij/openapi/wm/impl/ToolWindowHeader.java |  4 ++--
 .../wm/impl/content/ToolWindowContentUi.java       | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
index a83fa0c76c9d..f400145531e6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
@@ -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();
             }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java
index d343f0a81bd8..460b3ffe3810 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java
@@ -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);
+          }
+        }
+      }
     });