Refinement

1 files changed, 10 insertions, 8 deletions

diff --git a/patch/bar_status2d.c b/patch/bar_status2d.c
index 0adaadd..c4c7689 100644
--- a/patch/bar_status2d.c
+++ b/patch/bar_status2d.c
@@ -1,25 +1,25 @@
 int
-width_status2d(Monitor *m, BarWidthArg *a)
+width_status2d(Bar *bar, BarWidthArg *a)
 {
-	return status2dtextlength(rawstext);
+	return status2dtextlength(rawstext) + lrpad;
 }
 
 int
-draw_status2d(Monitor *m, BarDrawArg *a)
+draw_status2d(Bar *bar, BarDrawArg *a)
 {
-	return drawstatusbar(m, a->x, a->w, rawstext);
+	return drawstatusbar(a->x, rawstext);
 }
 
-#if !BAR_DWMBLOCKS_PATCH
+#if !BAR_STATUSCMD_PATCH
 int
-click_status2d(Monitor *m, Arg *arg, BarClickArg *a)
+click_status2d(Bar *bar, Arg *arg, BarClickArg *a)
 {
 	return ClkStatusText;
 }
-#endif // BAR_DWMBLOCKS_PATCH
+#endif // BAR_STATUSCMD_PATCH
 
 int
-drawstatusbar(Monitor *m, int x, int ow, char* stext)
+drawstatusbar(int x, char* stext)
 {
 	int i, w, len;
 	short isCode = 0;
@@ -36,6 +36,8 @@ drawstatusbar(Monitor *m, int x, int ow, char* stext)
 	memcpy(text, stext, len);
 	#endif // BAR_STATUSCMD_PATCH
 
+	x += lrpad / 2;
+
 	/* process status text */
 	i = -1;
 	while (text[++i]) {