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

Move base_width and base_height from Con to Window 

relates to #665
This commit is contained in:
Ingo Bürk 2015-08-30 22:48:37 +02:00
parent b68a400abf
commit 80ce13e44e
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/data.h
View File

@ -409,6 +409,11 @@ struct Window {
/** Depth of the window */ /** Depth of the window */
uint16_t depth; uint16_t depth;
/* the wanted size of the window, used in combination with size
* increments (see below). */
int base_width;
int base_height;
}; };
/** /**
@ -572,10 +577,6 @@ struct Con {
/* aspect ratio from WM_NORMAL_HINTS (MPlayer uses this for example) */ /* aspect ratio from WM_NORMAL_HINTS (MPlayer uses this for example) */
double aspect_ratio; double aspect_ratio;
/* the wanted size of the window, used in combination with size
* increments (see below). */
int base_width;
int base_height;
/* the x11 border pixel attribute */ /* the x11 border pixel attribute */
int border_width; int border_width;

12
src/floating.c
View File

@ -55,17 +55,17 @@ void floating_check_size(Con *floating_con) {
border_rect.height += render_deco_height(); border_rect.height += render_deco_height();
if (focused_con->height_increment && if (focused_con->height_increment &&
floating_con->rect.height >= focused_con->base_height + border_rect.height) { floating_con->rect.height >= focused_con->window->base_height + border_rect.height) {
floating_con->rect.height -= focused_con->base_height + border_rect.height; floating_con->rect.height -= focused_con->window->base_height + border_rect.height;
floating_con->rect.height -= floating_con->rect.height % focused_con->height_increment; floating_con->rect.height -= floating_con->rect.height % focused_con->height_increment;
floating_con->rect.height += focused_con->base_height + border_rect.height; floating_con->rect.height += focused_con->window->base_height + border_rect.height;
} }
if (focused_con->width_increment && if (focused_con->width_increment &&
floating_con->rect.width >= focused_con->base_width + border_rect.width) { floating_con->rect.width >= focused_con->window->base_width + border_rect.width) {
floating_con->rect.width -= focused_con->base_width + border_rect.width; floating_con->rect.width -= focused_con->window->base_width + border_rect.width;
floating_con->rect.width -= floating_con->rect.width % focused_con->width_increment; floating_con->rect.width -= floating_con->rect.width % focused_con->width_increment;
floating_con->rect.width += focused_con->base_width + border_rect.width; floating_con->rect.width += focused_con->window->base_width + border_rect.width;
} }
} }

8
src/handlers.c
View File

@ -960,10 +960,10 @@ static bool handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t stat
base_height = size_hints.min_height; base_height = size_hints.min_height;
} }
if (base_width != con->base_width || if (base_width != con->window->base_width ||
base_height != con->base_height) { base_height != con->window->base_height) {
con->base_width = base_width; con->window->base_width = base_width;
con->base_height = base_height; con->window->base_height = base_height;
DLOG("client's base_height changed to %d\n", base_height); DLOG("client's base_height changed to %d\n", base_height);
DLOG("client's base_width changed to %d\n", base_width); DLOG("client's base_width changed to %d\n", base_width);
changed = true; changed = true;