0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
InputOutput, RrVisual(ob_rr_inst),
CWOverrideRedirect, &attrib);
-
+
self->text = XCreateWindow(ob_display, self->bg,
0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
InputOutput, RrVisual(ob_rr_inst), 0, NULL);
self->a_text->texture[0].data.text.string = text;
self->textw = RrMinWidth(self->a_text);
} else
- self->textw = 0;
+ self->textw = 0;
}
void popup_height_to_string(ObPopup *self, gchar *text)
static gboolean popup_show_timeout(gpointer data)
{
ObPopup *self = data;
-
+
XMapWindow(ob_display, self->bg);
stacking_raise(INTERNAL_AS_WINDOW(self));
self->mapped = TRUE;
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);
x=MAX(MIN(x, area->width-w),0);
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);
+ /* 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)
for (i = self->desks; i < screen_num_desktops; ++i) {
XSetWindowAttributes attr;
- attr.border_pixel =
+ attr.border_pixel =
RrColorPixel(ob_rr_theme->osd_border_color);
self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
0, 0, 1, 1, ob_rr_theme->obwidth,