restore code that keeps popups on screen

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index 2755e6678056f9fd60a9eaa3231715ed35a9cc84..ecb07ada2b6ab200c27eed69ddaafc9541790e87 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -18,9 +18,6 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
 #include "render.h"
 #include "gradient.h"
 #include "font.h"
@@ -30,6 +27,9 @@
 #include "theme.h"
 
 #include <glib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xft/Xft.h>
 
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
@@ -369,7 +369,7 @@ gint RrMinWidth(RrAppearance *a)
                                     a->texture[i].data.text.string, 
                                     a->texture[i].data.text.shadow_offset_x,
                                     a->texture[i].data.text.shadow_offset_y);
-            w = MAX(w, m->width + 4);
+            w = MAX(w, m->width);
             g_free(m);
             break;
         case RR_TEXTURE_RGBA: