wmii

commit 8541f1043c24ca6a6f068b9a3fe1b38989756a8a
parent 5dcdccf39092ae7975a3ab05b059de919dd184f2
Author: Kris Maglione <jg@suckless.org>
Date:   Fri,  9 Feb 2007 13:21:07 -0500

Fixed drawing of rectangle borders


Diffstat:
draw.c
 | 
3
++-
frame.c
 | 
10
++++++----

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/draw.c b/draw.c
@@ -155,7 +155,8 @@ drawbg(Display *dpy, Drawable drawable, GC gc, XRectangle *rect,
 	if(border) {
 		XSetLineAttributes(dpy, gc, border, LineSolid, CapButt, JoinMiter);
 		XSetForeground(dpy, gc, c.border);
-		XDrawRectangle(dpy, drawable, gc, rect->x, rect->y, rect->width - 1, rect->height - 1);
+		XDrawRectangle(dpy, drawable, gc, rect->x + border / 2, rect->y + border / 2,
+				rect->width - border, rect->height - border);
 	}
 }
 
diff --git a/frame.c b/frame.c
@@ -173,6 +173,7 @@ draw_frame(Frame *f) {
 		f->tile.border = def.border;
 		f->tile.rect = f->rect;
 		f->tile.rect.x = f->tile.rect.y = 0;
+		draw_border(&f->tile);
 	}
 	f->grabbox.rect = f->tile.rect;
 	f->grabbox.rect.height = labelh(&def.font);
@@ -180,14 +181,15 @@ draw_frame(Frame *f) {
 	f->titlebar.rect = f->grabbox.rect;
 	f->titlebar.rect.x = f->grabbox.rect.x + f->grabbox.rect.width;
 	f->titlebar.rect.width = f->rect.width -  f->titlebar.rect.x;
+	f->titlebar.border = 0;
 	draw_tile(&f->tile);
 	draw_tile(&f->grabbox);
 	draw_label(&f->titlebar, f->client->name);
-	draw_border(&f->tile);
 	/* XXX: Hack */
-	f->tile.rect.height = labelh(&def.font);
-	f->tile.border = 1;
-	draw_border(&f->tile);
+	f->titlebar.rect.x = 0;
+	f->titlebar.rect.width += f->grabbox.rect.width;
+	f->titlebar.border = 1;
+	draw_border(&f->titlebar);
 	XCopyArea(blz.dpy, pmap, f->client->framewin, f->client->gc,
 			0, 0, f->rect.width, f->rect.height, 0, 0);
 	XSync(blz.dpy, False);