Bugfix: Also fix horizontal resizing
The same problem as in the commit before this one was present. Additionally, the dock_clients and internal bar were not taken into account everywhere.next
parent
0f64737a56
commit
3057a2ec65
|
@ -83,4 +83,17 @@ void workspace_map_clients(xcb_connection_t *conn, Workspace *ws);
|
|||
*/
|
||||
void workspace_update_urgent_flag(Workspace *ws);
|
||||
|
||||
/*
|
||||
* Returns the width of the workspace.
|
||||
*
|
||||
*/
|
||||
int workspace_width(Workspace *ws);
|
||||
|
||||
/*
|
||||
* Returns the effective height of the workspace (without the internal bar and
|
||||
* without dock clients).
|
||||
*
|
||||
*/
|
||||
int workspace_height(Workspace *ws);
|
||||
|
||||
#endif
|
||||
|
|
12
src/layout.c
12
src/layout.c
|
@ -65,17 +65,7 @@ int get_unoccupied_x(Workspace *workspace) {
|
|||
|
||||
/* See get_unoccupied_x() */
|
||||
int get_unoccupied_y(Workspace *workspace) {
|
||||
int height = workspace->rect.height;
|
||||
i3Font *font = load_font(global_conn, config.font);
|
||||
|
||||
/* Reserve space for dock clients */
|
||||
Client *client;
|
||||
SLIST_FOREACH(client, &(workspace->screen->dock_clients), dock_clients)
|
||||
height -= client->desired_height;
|
||||
|
||||
/* Space for the internal bar */
|
||||
height -= (font->height + 6);
|
||||
|
||||
int height = workspace_height(workspace);
|
||||
int unoccupied = height;
|
||||
float default_factor = ((float)height / workspace->rows) / height;
|
||||
|
||||
|
|
42
src/resize.c
42
src/resize.c
|
@ -27,6 +27,7 @@
|
|||
#include "xinerama.h"
|
||||
#include "config.h"
|
||||
#include "floating.h"
|
||||
#include "workspace.h"
|
||||
|
||||
/*
|
||||
* Renders the resize window between the first/second container and resizes
|
||||
|
@ -204,7 +205,8 @@ void resize_container(xcb_connection_t *conn, Workspace *ws, int first, int seco
|
|||
|
||||
LOG("\n\n\n");
|
||||
} else {
|
||||
int default_height = ws->rect.height / ws->rows;
|
||||
int ws_height = workspace_height(ws);
|
||||
int default_height = ws_height / ws->rows;
|
||||
int old_unoccupied_y = get_unoccupied_y(ws);
|
||||
|
||||
/* We pre-calculate the unoccupied space to see if we need to adapt sizes before
|
||||
|
@ -212,7 +214,7 @@ void resize_container(xcb_connection_t *conn, Workspace *ws, int first, int seco
|
|||
int new_unoccupied_y = old_unoccupied_y;
|
||||
|
||||
if (old_unoccupied_y == 0)
|
||||
old_unoccupied_y = ws->rect.height;
|
||||
old_unoccupied_y = ws_height;
|
||||
|
||||
if (ws->height_factor[first] == 0)
|
||||
new_unoccupied_y += default_height;
|
||||
|
@ -220,6 +222,28 @@ void resize_container(xcb_connection_t *conn, Workspace *ws, int first, int seco
|
|||
if (ws->height_factor[second] == 0)
|
||||
new_unoccupied_y += default_height;
|
||||
|
||||
int cols_without_hf = 0;
|
||||
int old_height, old_second_height;
|
||||
for (int row = 0; row < ws->rows; row++)
|
||||
if (ws->height_factor[row] == 0)
|
||||
cols_without_hf++;
|
||||
|
||||
LOG("old_unoccupied_y = %d\n", old_unoccupied_y);
|
||||
|
||||
LOG("Updating first (before = %f)\n", ws->height_factor[first]);
|
||||
/* Convert 0 (for default width_factor) to actual numbers */
|
||||
if (ws->height_factor[first] == 0)
|
||||
old_height = (old_unoccupied_y / max(cols_without_hf, 1));
|
||||
else old_height = ws->height_factor[first] * old_unoccupied_y;
|
||||
|
||||
LOG("second (before = %f)\n", ws->height_factor[second]);
|
||||
if (ws->height_factor[second] == 0)
|
||||
old_second_height = (old_unoccupied_y / max(cols_without_hf, 1));
|
||||
else old_second_height = ws->height_factor[second] * old_unoccupied_y;
|
||||
|
||||
LOG("middle = %f\n", ws->height_factor[first]);
|
||||
|
||||
|
||||
LOG("\n\n\n");
|
||||
LOG("old = %d, new = %d\n", old_unoccupied_y, new_unoccupied_y);
|
||||
|
||||
|
@ -235,27 +259,23 @@ void resize_container(xcb_connection_t *conn, Workspace *ws, int first, int seco
|
|||
LOG("to %f\n", ws->height_factor[row]);
|
||||
}
|
||||
|
||||
LOG("old_unoccupied_y = %d\n", old_unoccupied_y);
|
||||
|
||||
LOG("Updating first (before = %f)\n", ws->height_factor[first]);
|
||||
/* Convert 0 (for default width_factor) to actual numbers */
|
||||
if (ws->height_factor[first] == 0)
|
||||
ws->height_factor[first] = ((float)ws->rect.height / ws->rows) / new_unoccupied_y;
|
||||
ws->height_factor[first] = ((float)ws_height / ws->rows) / new_unoccupied_y;
|
||||
|
||||
LOG("middle = %f\n", ws->height_factor[first]);
|
||||
int old_height = ws->height_factor[first] * old_unoccupied_y;
|
||||
LOG("first->width = %d, pixels = %d\n", pixels);
|
||||
LOG("first->width = %d, pixels = %d\n", old_height, pixels);
|
||||
ws->height_factor[first] *= (float)(old_height + pixels) / old_height;
|
||||
LOG("-> %f\n", ws->height_factor[first]);
|
||||
|
||||
|
||||
LOG("Updating second (before = %f)\n", ws->height_factor[second]);
|
||||
if (ws->height_factor[second] == 0)
|
||||
ws->height_factor[second] = ((float)ws->rect.height / ws->rows) / new_unoccupied_y;
|
||||
ws->height_factor[second] = ((float)ws_height / ws->rows) / new_unoccupied_y;
|
||||
LOG("middle = %f\n", ws->height_factor[second]);
|
||||
old_height = ws->height_factor[second] * old_unoccupied_y;
|
||||
LOG("second->width = %d, pixels = %d\n", pixels);
|
||||
ws->height_factor[second] *= (float)(old_height - pixels) / old_height;
|
||||
LOG("second->width = %d, pixels = %d\n", old_second_height, pixels);
|
||||
ws->height_factor[second] *= (float)(old_second_height - pixels) / old_second_height;
|
||||
LOG("-> %f\n", ws->height_factor[second]);
|
||||
|
||||
LOG("new unoccupied_y = %d\n", get_unoccupied_y(ws));
|
||||
|
|
|
@ -417,3 +417,31 @@ void workspace_update_urgent_flag(Workspace *ws) {
|
|||
|
||||
ws->urgent = false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns the width of the workspace.
|
||||
*
|
||||
*/
|
||||
int workspace_width(Workspace *ws) {
|
||||
return ws->rect.width;
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns the effective height of the workspace (without the internal bar and
|
||||
* without dock clients).
|
||||
*
|
||||
*/
|
||||
int workspace_height(Workspace *ws) {
|
||||
int height = ws->rect.height;
|
||||
i3Font *font = load_font(global_conn, config.font);
|
||||
|
||||
/* Reserve space for dock clients */
|
||||
Client *client;
|
||||
SLIST_FOREACH(client, &(ws->screen->dock_clients), dock_clients)
|
||||
height -= client->desired_height;
|
||||
|
||||
/* Space for the internal bar */
|
||||
height -= (font->height + 6);
|
||||
|
||||
return height;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue