Center the moveresize popup even when shaded.

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 8dc122c7947f9e1803349ee3976f5a9322308674..333144bc10b818bfc0a44a68cb4be0bd48c82626 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -108,10 +108,8 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
                        c->frame->area.y - ob_rr_theme->fbwidth);
     else if (config_resize_popup_pos == OB_RESIZE_POS_CENTER)
         popup_position(popup, CenterGravity,
-                       c->frame->area.x + c->frame->size.left +
-                       c->area.width / 2,
-                       c->frame->area.y + c->frame->size.top +
-                       c->area.height / 2);
+                       c->frame->area.x + c->frame->area.width / 2,
+                       c->frame->area.y + c->frame->area.height / 2);
     else /* Fixed */ {
         Rect *area = screen_physical_area_active();
         gint gravity, x, y;
@@ -126,7 +124,7 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
 
         y = config_resize_popup_fixed.y.pos;
         if (config_resize_popup_fixed.y.center)
-            y = area->y + area->width/2;
+            y = area->y + area->height/2;
         else if (config_resize_popup_fixed.y.opposite)
             y = RECT_RIGHT(*area) - y;
         else
@@ -252,7 +250,8 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
 
 #ifdef SYNC
     if (config_resize_redraw && !moving && extensions_sync &&
-        moveresize_client->sync_request && moveresize_client->sync_counter)
+        moveresize_client->sync_request && moveresize_client->sync_counter &&
+        !moveresize_client->not_responding)
     {
         /* Initialize values for the resize syncing, and create an alarm for
            the client's xsync counter */
@@ -347,7 +346,6 @@ static void do_move(gboolean keyboard, gint keydist)
                      moveresize_client->frame->area.y);
 }
 
-
 static void do_resize(void)
 {
     gint x, y, w, h, lw, lh;
@@ -367,7 +365,8 @@ static void do_resize(void)
 
 #ifdef SYNC
     if (config_resize_redraw && extensions_sync &&
-        moveresize_client->sync_request && moveresize_client->sync_counter)
+        moveresize_client->sync_request && moveresize_client->sync_counter &&
+        !moveresize_client->not_responding)
     {
         XEvent ce;
         XSyncValue val;