use the label only for popups without an icon, if the label is not parentrelative
Dana Jansens danakj@orodu.net
1 files changed,
14 insertions(+),
2 deletions(-)
jump to
M
openbox/popup.c
→
openbox/popup.c
@@ -158,7 +158,10 @@ Rect *area;
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 @@
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 @@ y=MAX(MIN(y, area->height-h),0);
/* 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;