From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 May 2007 16:31:57 +0000 (+0000)
Subject: merge r6299 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~108
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=cee3286c426bf7303bea15d9cf6bfeba0ce41487;p=dana%2Fopenbox.git

merge r6299 from trunk
---

diff --git a/openbox/popup.c b/openbox/popup.c
index 5c96f073..d1e1a31f 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -177,7 +177,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
         textw = self->textw;
 
     iconx = textx = l + ob_rr_theme->paddingx;
-    icony = texty = t + ob_rr_theme->paddingy;
 
     emptyx = l + r + ob_rr_theme->paddingx * 2;
     if (self->hasicon) {
@@ -189,6 +188,9 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     } else
         iconw = 0;
 
+    texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
+    icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
+
     w = textw + emptyx + iconw;
     /* cap it at maxw/minw */
     if (self->maxw) w = MIN(w, self->maxw);