all repos — openbox @ b7780b749f5a8a9b0e4ff27736edaf2336238507

openbox fork - make it a bit more like ryudo 

proper centering of the text in popups without icons
Dana Jansens danakj@orodu.net
commit

b7780b749f5a8a9b0e4ff27736edaf2336238507

parent

4b2ec0d03c1f9706f542d5b64e08a1fca6ca508a

1 files changed, 7 insertions(+), 5 deletions(-)

jump to
M openbox/popup.c → openbox/popup.c 
@@ -83,7 +83,7 @@ texth += theme_bevel * 2;
 
     self->h = texth + theme_bevel * 2;
     iconw = (self->hasicon ? texth : 0);
-    self->w = textw + iconw + theme_bevel * 3;
+    self->w = textw + iconw + theme_bevel * (self->hasicon ? 3 : 2);
 }
 
 void popup_show(Popup *self, char *text, Icon *icon)

@@ -149,9 +149,9 @@ h = texth + theme_bevel * 2;
     iconw = (self->hasicon ? texth : 0);
     if (self->w) {
         w = self->w;
-        textw = w - (iconw + theme_bevel * 3);
+        textw = w - (iconw + theme_bevel * (self->hasicon ? 3 : 2));
     } else
-        w = textw + iconw + theme_bevel * 3;
+        w = textw + iconw + theme_bevel * (self->hasicon ? 3 : 2);
     /* sanity checks to avoid crashes! */
     if (w < 1) w = 1;
     if (h < 1) h = 1;

@@ -196,10 +196,12 @@ RECT_SET(self->a_text->area, 0, 0, textw, texth);
     RECT_SET(self->a_text->texture[0].position, theme_bevel, theme_bevel,
              textw - theme_bevel * 2, texth - theme_bevel * 2);
     self->a_text->surface.data.planar.parent = self->a_bg;
-    self->a_text->surface.data.planar.parentx = iconw + theme_bevel * 2;
+    self->a_text->surface.data.planar.parentx = iconw +
+        theme_bevel * (self->hasicon ? 2 : 1);
     self->a_text->surface.data.planar.parenty = theme_bevel;
     XMoveResizeWindow(ob_display, self->text,
-                      iconw + theme_bevel * 2, theme_bevel, textw, texth);
+                      iconw + theme_bevel * (self->hasicon ? 2 : 1),
+                      theme_bevel, textw, texth);
 
     if (self->hasicon) {
         if (iconw < 1) iconw = 1; /* sanity check for crashes */