adjust choosing to focus new windows, make it more strict.

[chaz/openbox] / openbox / framerender.c

diff --git a/openbox/framerender.c b/openbox/framerender.c
index 44a6b78412ef17d9657765cbb653da748a00b24b..59ede4d852719de5682374ca29bab5c68e6997d2 100644 (file)
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -228,6 +228,10 @@ void framerender_popup_label(Window win, Size *sz, char *text)
     a->texture[0].data.text.string = text;
     RECT_SET(a->area, 0, 0, sz->width, sz->height);
     a->texture[0].position = a->area;
+    a->texture[0].position.x += theme_bevel;
+    a->texture[0].position.y += theme_bevel;
+    a->texture[0].position.width -= theme_bevel * 2;
+    a->texture[0].position.height -= theme_bevel * 2;
 
     XSetWindowBorderWidth(ob_display, win, theme_bwidth);
     XSetWindowBorder(ob_display, win, theme_b_color->pixel);
@@ -242,7 +246,7 @@ void framerender_size_popup_label(char *text, Size *sz)
     a = theme_app_hilite_label;
     a->texture[0].data.text.string = text;
 
-    appearance_minsize(a, sz);
+    appearance_minsize(a, &sz->width, &sz->height);
     sz->width += theme_bevel * 2;
     sz->height += theme_bevel * 2;
 }