Fix negative ResizeRelative values with terminal windows (Fix bug 5228)

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 8ff8c5330df1670e17fd87a53d1c6e11c1117e70..2a83d7b8ed652832026526334cda9bc0455e36a4 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -148,7 +148,6 @@ static gboolean popup_show_timeout(gpointer data)
     self->delay_mapped = FALSE;
     self->delay_timer = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -201,11 +200,11 @@ void popup_delay_show(ObPopup *self, gulong msec, gchar *text)
         textx += iconw + ob_rr_theme->paddingx;
         if (textw)
             emptyx += ob_rr_theme->paddingx; /* between the icon and text */
+        icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
     } else
         iconw = 0;
 
     texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
-    icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
 
     /* when there is no icon, then fill the whole dialog with the text
        appearance