gint emptyx, emptyy; /* empty space between elements */
gint textx, texty, textw, texth;
gint iconx, icony, iconw, iconh;
- Rect *area;
+ Rect *area, mon;
- area = screen_physical_area();
+ RECT_SET(mon, self->x, self->y, 1, 1);
+ area = screen_physical_area_monitor(screen_find_monitor(&mon));
- RrMargins(self->a_bg, &l, &t, &r, &b);
+ /* when there is no icon and the text is not parent relative, then
+ fill the whole dialog with the text appearance, don't use the bg at all
+ */
+ 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;
texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
+ /* when there is no icon, then fill the whole dialog with the text
+ appearance
+ */
+ if (!self->hasicon)
+ {
+ 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);
/* set the windows/appearances up */
XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
- RrPaint(self->a_bg, self->bg, w, h);
+ /* when there is no icon and the text is not parent relative, then
+ fill the whole dialog with the text appearance, don't use the bg at all
+ */
+ 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;
popup_show_timeout(self);
}
}
+
+ g_free(area);
}
void popup_hide(ObPopup *self)