diff options
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: client.c,v 1.62 2009/08/25 01:26:09 okan Exp $ + * $Id: client.c,v 1.63 2009/08/25 01:32:40 oga Exp $ */ #include "headers.h" @@ -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; |