X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=4ac234d73315a9d3137078f70c0643e3a99f4249;hb=5e38ae49ce5ceb5b983ee7d486439238a42c8431;hp=23348d510981088eeeb7de8b80a86725b6584490;hpb=4c0adb1f2b05d1b3d3325f468d159731f511db3c;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 23348d51..4ac234d7 100644
--- 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,7 +1963,7 @@ 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);