void menu_render_full(Menu *self);
void menu_render(Menu *self) {
- if (self->invalid) {
- if (self->update) {
- self->update(self);
- } else {
- menu_render_full(self);
- }
+ if (self->update) {
+ self->update(self);
+ } else if (self->invalid) {
+ menu_render_full(self);
}
}
-
void menu_render_full(Menu *self) {
GList *it;
if (self->a_title == NULL) {
XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth);
XSetWindowBackground(ob_display, self->frame,
- ob_rr_theme->b_color->pixel);
+ RrColorPixel(ob_rr_theme->b_color));
XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
- XSetWindowBorder(ob_display, self->frame, ob_rr_theme->b_color->pixel);
- XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
+ XSetWindowBorder(ob_display, self->frame,
+ RrColorPixel(ob_rr_theme->b_color));
+ XSetWindowBorder(ob_display, self->title,
+ RrColorPixel(ob_rr_theme->b_color));
self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
self->item_h += ob_rr_theme->bevel * 2;
items_h = self->item_h * MAX(nitems, 1);
- XResizeWindow(ob_display, self->frame, self->size.width,
- MAX(self->title_h + items_h, 1));
+ self->size.height = MAX(self->title_h + items_h + ob_rr_theme->bwidth, 1);
+ XResizeWindow(ob_display, self->frame, self->size.width,self->size.height);
if (self->label)
XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth,
-ob_rr_theme->bwidth,
item_y += self->item_h;
}
- self->size.height = item_y;
self->invalid = FALSE;
}
self->a_hilite : self->a_item);
break;
}
+ g_message ("%s %d", self->label, self->hilite);
XMoveResizeWindow(ob_display, self->item, 0, self->y,
menu->size.width, menu->item_h);