diff options
Diffstat (limited to 'openbox/popup.c')
| -rw-r--r-- | openbox/popup.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/openbox/popup.c b/openbox/popup.c index 6099edcb..60027386 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -158,7 +158,10 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) area = screen_physical_area(); - RrMargins(self->a_bg, &l, &t, &r, &b); + if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) + RrMargins(self->a_bg, &l, &t, &r, &b); + else + l = t = r = b = 0; /* set up the textures */ self->a_text->texture[0].data.text.string = text; @@ -195,6 +198,14 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy; icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy; + if (!(self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)) + { + textx = texty = 0; + texth += emptyy; + textw += emptyx; + emptyx = emptyy = 0; + } + w = textw + emptyx + iconw; /* cap it at maxw/minw */ if (self->maxw) w = MIN(w, self->maxw); @@ -233,7 +244,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) /* set the windows/appearances up */ XMoveResizeWindow(ob_display, self->bg, x, y, w, h); - RrPaint(self->a_bg, self->bg, w, h); + if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) + RrPaint(self->a_bg, self->bg, w, h); if (textw) { self->a_text->surface.parent = self->a_bg; |