From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 23 Nov 2009 08:42:38 +0000 (+0100)
Subject: Bugfix: Resize client after updating base_height/base_width (Thanks Merovius)
X-Git-Tag: 3.e~6^2~224
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5329ed01580bfe63e3311dd0e43b8f696d996795;p=i3%2Fi3

Bugfix: Resize client after updating base_height/base_width (Thanks Merovius)

This fixes the problem that urxvt/xterm "lost" a line of space before
being resized the first time.
---

diff --git a/src/handlers.c b/src/handlers.c
index b9a6169c..e9c44da6 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -889,8 +889,13 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w
                 base_height = size_hints.min_height;
         }
 
-        client->base_width = base_width;
-        client->base_height = base_height;
+        if (base_width != client->base_width ||
+            base_height != client->base_height) {
+                client->base_width = base_width;
+                client->base_height = base_height;
+                LOG("client's base_height changed to %d\n", base_height);
+                resize_client(conn, client);
+        }
 
         /* If no aspect ratio was set or if it was invalid, we ignore the hints */
         if (!(size_hints.flags & XCB_SIZE_HINT_P_ASPECT) ||
diff --git a/src/layout.c b/src/layout.c
index 1e7c7a03..101b1ddb 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -322,15 +322,15 @@ void resize_client(xcb_connection_t *conn, Client *client) {
         if (client->height_increment > 1) {
                 int old_height = rect->height;
                 rect->height -= (rect->height - client->base_height) % client->height_increment;
-                LOG("Lost %d pixel due to client's height_increment (%d px)\n",
-                    old_height - rect->height, client->height_increment);
+                LOG("Lost %d pixel due to client's height_increment (%d px, base_height = %d)\n",
+                    old_height - rect->height, client->height_increment, client->base_height);
         }
 
         if (client->width_increment > 1) {
                 int old_width = rect->width;
                 rect->width -= (rect->width - client->base_width) % client->width_increment;
-                LOG("Lost %d pixel due to client's width_increment (%d px)\n",
-                    old_width - rect->width, client->width_increment);
+                LOG("Lost %d pixel due to client's width_increment (%d px, base_width = %d)\n",
+                    old_width - rect->width, client->width_increment, client->base_width);
         }
 
         LOG("child will be at %dx%d with size %dx%d\n", rect->x, rect->y, rect->width, rect->height);