1 files changed, 7 insertions, 2 deletions
diff --git a/dwl.c b/dwl.c
index 07c5022..f25d5ca 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1637,9 +1637,14 @@ drawbar(Monitor *m)
 	if ((w = m->b.width - tw - x) > m->b.height) {
 		if (c) {
 			drwl_setscheme(m->drw, colors[m == selmon ? SchemeTitle : SchemeNorm]);
-			drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, client_get_title(c), 0);
+			tw = TEXTW(selmon, client_get_title(c));
+			drwl_text(m->drw, x, 0, w, m->b.height,
+		    		 tw > w ? m->lrpad / 2 : (w - tw) / 2,
+		    		client_get_title(c), 0);
 			if (c && c->isfloating)
-				drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, 0, 0);
+				drwl_rect(m->drw,
+					tw > w ? x + boxs : x + ((w - tw) / 2 - boxs * 8),
+					boxs, boxw, boxw, 0, 0);
 		} else {
 			drwl_setscheme(m->drw, colors[SchemeNorm]);
 			drwl_rect(m->drw, x, 0, w, m->b.height, 1, 1);