nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the label only for popups without an icon, if the label is not parentrelative

Browse source
This commit is contained in:
Dana Jansens 2007-06-05 16:41:36 +00:00
parent c52b63e9d4
commit 3499ea8397
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openbox/popup.c
View file

@ -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;