use the current size not the start size for moving

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index aa3174f73e3aa91084c98b96a6c0e3632989b2ca..4ac234d73315a9d3137078f70c0643e3a99f4249 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -660,8 +660,6 @@ static void client_get_all(ObClient *self)
     client_get_state(self);
     client_get_shaped(self);
 
-    g_message("self->iconic %d", self->iconic);
-
     client_get_mwm_hints(self);
     client_get_type(self);/* this can change the mwmhints for special cases */
 
@@ -1715,7 +1713,6 @@ static void client_apply_startup_state(ObClient *self)
 {
     /* these are in a carefully crafted order.. */
 
-    g_message("self->iconic %d", self->iconic);
     if (self->iconic) {
        self->iconic = FALSE;
        client_iconify(self, TRUE, FALSE);
@@ -1932,7 +1929,7 @@ void client_configure_full(ObClient *self, ObCorner anchor,
 
     /* if the client is enlarging, the resize the client before the frame */
     if (send_resize_client && (w > oldw || h > oldh))
-       XResizeWindow(ob_display, self->window, w, h);
+       XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh));
 
     /* move/resize the frame to match the request */
     if (self->frame) {
@@ -1966,8 +1963,10 @@ void client_configure_full(ObClient *self, ObCorner anchor,
     }
 
     /* if the client is shrinking, then resize the frame before the client */
-    if (send_resize_client && (w <= oldw && h <= oldh))
+    if (send_resize_client && (w <= oldw || h <= oldh))
        XResizeWindow(ob_display, self->window, w, h);
+
+    XFlush(ob_display);
 }
 
 void client_fullscreen(ObClient *self, gboolean fs, gboolean savearea)