55,56c55,56
< #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
< #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
---
> #define WIDTH(X)                ((X)->w + 2 * (X)->bw + gappx)
> #define HEIGHT(X)               ((X)->h + 2 * (X)->bw + gappx)
1506a1507,1508
> 	unsigned int gapoffset;
> 	unsigned int gapincr;
1509,1512c1511,1521
< 	c->oldx = c->x; c->x = wc.x = x;
< 	c->oldy = c->y; c->y = wc.y = y;
< 	c->oldw = c->w; c->w = wc.width = w;
< 	c->oldh = c->h; c->h = wc.height = h;
---
> 	if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
> 		gapincr = gapoffset = 0;
> 	} else {
> 		gapoffset = gappx;
> 		gapincr = 2 * gappx;
> 	}
> 
> 	c->oldx = c->x; c->x = wc.x = x + gapoffset;
> 	c->oldy = c->y; c->y = wc.y = y + gapoffset;
> 	c->oldw = c->w; c->w = wc.width = w - gapincr;
> 	c->oldh = c->h; c->h = wc.height = h - gapincr;