From: Dana Jansens <danakj@orodu.net>
Date: Wed, 9 May 2007 23:46:08 +0000 (+0000)
Subject: merge r6252 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~125
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a0d6737156d9e211459313ecc52ec6ee883c7ad1;p=dana%2Fopenbox.git

merge r6252 from trunk
---

diff --git a/openbox/event.c b/openbox/event.c
index 8523f637..566739c9 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -791,32 +791,47 @@ static void event_handle_client(ObClient *client, XEvent *e)
         switch (con) {
         case OB_FRAME_CONTEXT_TITLEBAR:
             /* we've left the button area inside the titlebar */
-            client->frame->max_hover = FALSE;
-            client->frame->desk_hover = FALSE;
-            client->frame->shade_hover = FALSE;
-            client->frame->iconify_hover = FALSE;
-            client->frame->close_hover = FALSE;
-            frame_adjust_state(client->frame);
+            if (client->frame->max_hover || client->frame->desk_hover ||
+                client->frame->shade_hover || client->frame->iconify_hover ||
+                client->frame->close_hover)
+            {
+                client->frame->max_hover = FALSE;
+                client->frame->desk_hover = FALSE;
+                client->frame->shade_hover = FALSE;
+                client->frame->iconify_hover = FALSE;
+                client->frame->close_hover = FALSE;
+                frame_adjust_state(client->frame);
+            }
             break;
         case OB_FRAME_CONTEXT_MAXIMIZE:
-            client->frame->max_hover = TRUE;
-            frame_adjust_state(client->frame);
+            if (!client->frame->max_hover) {
+                client->frame->max_hover = TRUE;
+                frame_adjust_state(client->frame);
+            }
             break;
         case OB_FRAME_CONTEXT_ALLDESKTOPS:
-            client->frame->desk_hover = TRUE;
-            frame_adjust_state(client->frame);
+            if (!client->frame->desk_hover) {
+                client->frame->desk_hover = TRUE;
+                frame_adjust_state(client->frame);
+            }
             break;
         case OB_FRAME_CONTEXT_SHADE:
-            client->frame->shade_hover = TRUE;
-            frame_adjust_state(client->frame);
+            if (!client->frame->shade_hover) {
+                client->frame->shade_hover = TRUE;
+                frame_adjust_state(client->frame);
+            }
             break;
         case OB_FRAME_CONTEXT_ICONIFY:
-            client->frame->iconify_hover = TRUE;
-            frame_adjust_state(client->frame);
+            if (!client->frame->iconify_hover) {
+                client->frame->iconify_hover = TRUE;
+                frame_adjust_state(client->frame);
+            }
             break;
         case OB_FRAME_CONTEXT_CLOSE:
-            client->frame->close_hover = TRUE;
-            frame_adjust_state(client->frame);
+            if (!client->frame->close_hover) {
+                client->frame->close_hover = TRUE;
+                frame_adjust_state(client->frame);
+            }
             break;
         default:
             break;