mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
Instead of messing around everytime we do a resize, just clamp the
resize increments to a minimum of one, and use it unconditionally. "you've convinced me, do it!" okan@
This commit is contained in:
parent
fcb2684db1
commit
8fd4ff1c7c
9
client.c
9
client.c
@ -685,6 +685,9 @@ client_getsizehints(struct client_ctx *cc)
|
||||
cc->geom.incw = cc->size->width_inc;
|
||||
cc->geom.inch = cc->size->height_inc;
|
||||
}
|
||||
cc->geom.incw = MAX(1, cc->geom.incw);
|
||||
cc->geom.inch = MAX(1, cc->geom.inch);
|
||||
|
||||
if (cc->size->flags & PAspect) {
|
||||
if (cc->size->min_aspect.x > 0)
|
||||
cc->geom.mina = (float)cc->size->min_aspect.y /
|
||||
@ -725,10 +728,8 @@ client_applysizehints(struct client_ctx *cc)
|
||||
}
|
||||
|
||||
/* adjust for increment value */
|
||||
if (cc->geom.incw)
|
||||
cc->geom.width -= cc->geom.width % cc->geom.incw;
|
||||
if (cc->geom.inch)
|
||||
cc->geom.height -= cc->geom.height % cc->geom.inch;
|
||||
cc->geom.width -= cc->geom.width % cc->geom.incw;
|
||||
cc->geom.height -= cc->geom.height % cc->geom.inch;
|
||||
|
||||
/* restore base dimensions */
|
||||
cc->geom.width += cc->geom.basew;
|
||||
|
@ -49,8 +49,8 @@ mousefunc_sweep_draw(struct client_ctx *cc)
|
||||
int width, height, width_size, width_name;
|
||||
|
||||
snprintf(asize, sizeof(asize), "%dx%d",
|
||||
(cc->geom.width - cc->geom.basew) / MAX(1, cc->geom.incw),
|
||||
(cc->geom.height - cc->geom.baseh) / MAX(1, cc->geom.inch));
|
||||
(cc->geom.width - cc->geom.basew) / cc->geom.incw,
|
||||
(cc->geom.height - cc->geom.baseh) / cc->geom.inch);
|
||||
width_size = font_width(asize, strlen(asize)) + 4;
|
||||
width_name = font_width(cc->name, strlen(cc->name)) + 4;
|
||||
width = MAX(width_size, width_name);
|
||||
|
Loading…
Reference in New Issue
Block a user