From 1bd43ed930829711f6b163779e85e2b9f7f30680 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 8 Feb 2008 13:54:32 +0100 Subject: [PATCH] Revert popup.c from 74ef28 --- openbox/popup.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) 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 */ -- 2.34.1