nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Fix resizing of floating windows in borderless/1-px-border mode (Thanks Grauwolf) 

Calculations were wrong (they simply didn’t take into account that
there is more than one border style, the code was from before we
implemented that…). We cannot directly set child_rect to the coordinates
as resize_client takes rect and calculates the child_rect, so we need
the new lines of code for this bugfix in any case (rect needs to be
updated).
This commit is contained in:
Michael Stapelberg 2009-11-18 22:53:17 +01:00
parent a74fdc64f9
commit 2a966014a7
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/handlers.c
View File

@ -340,15 +340,34 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
/* Floating clients can be reconfigured */ /* Floating clients can be reconfigured */
if (client_is_floating(client)) { if (client_is_floating(client)) {
i3Font *font = load_font(conn, config.font); i3Font *font = load_font(conn, config.font);
int mode = (client->container != NULL ? client->container->mode : MODE_DEFAULT);
if (event->value_mask & XCB_CONFIG_WINDOW_X) if (event->value_mask & XCB_CONFIG_WINDOW_X)
client->rect.x = event->x; client->rect.x = event->x;
if (event->value_mask & XCB_CONFIG_WINDOW_Y) if (event->value_mask & XCB_CONFIG_WINDOW_Y)
client->rect.y = event->y; client->rect.y = event->y;
if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
if (mode == MODE_STACK || mode == MODE_TABBED) {
client->rect.width = event->width + 2 + 2; client->rect.width = event->width + 2 + 2;
if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) } else {
client->rect.height = event->height + (font->height + 2 + 2) + 2; if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
client->rect.width = event->width;
else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
client->rect.width = event->width + (1 + 1);
else client->rect.width = event->width + (2 + 2);
}
}
if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
if (mode == MODE_STACK || mode == MODE_TABBED) {
client->rect.height = event->height + 2;
} else {
if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
client->rect.height = event->height;
else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
client->rect.height = event->height + (1 + 1);
else client->rect.height = event->height + (font->height + 2 + 2) + 2;
}
}
LOG("Accepted new position/size for floating client: (%d, %d) size %d x %d\n", LOG("Accepted new position/size for floating client: (%d, %d) size %d x %d\n",
client->rect.x, client->rect.y, client->rect.width, client->rect.height); client->rect.x, client->rect.y, client->rect.width, client->rect.height);