From: Mikael Magnusson <mikachu@comhem.se>
Date: Fri, 8 Feb 2008 12:54:32 +0000 (+0100)
Subject: Revert popup.c from 74ef28
X-Git-Tag: mikabox-3.4.7.2~55^2~7
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1bd43ed930829711f6b163779e85e2b9f7f30680;p=mikachu%2Fopenbox.git

Revert popup.c from 74ef28
---

diff --git a/openbox/popup.c b/openbox/popup.c
index f5ee7c42..fd31846e 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -179,15 +179,9 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     /* get the height, which is also used for the icon width */
     emptyy = t + b + ob_rr_theme->paddingy * 2;
-    if (self->hasicon) {
-        if (self->h)
-            h = self->h - emptyy;
-        h = h * self->iconhm + emptyy;
-    } else {
-        if (self->h)
-            texth = self->h - emptyy;
-        h = texth * self->iconhm + emptyy;
-    }
+    if (self->h)
+        texth = self->h - emptyy;
+    h = texth * self->iconhm + emptyy;
 
     if (self->textw)
         textw = self->textw;
@@ -196,8 +190,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     emptyx = l + r + ob_rr_theme->paddingx * 2;
     if (self->hasicon) {
-        iconw = h * self->iconwm;
-        iconh = h * self->iconhm;
+        iconw = texth * self->iconwm;
+        iconh = texth * self->iconhm;
         textx += iconw + ob_rr_theme->paddingx;
         if (textw)
             emptyx += ob_rr_theme->paddingx; /* between the icon and text */