/* set texture data and size them mofos out */
if (self->label) {
self->a_title->texture[0].data.text.string = self->label;
- appearance_minsize(self->a_title, &self->title_min_w, &self->title_h);
- self->title_min_w += theme_bevel * 2;
- self->title_h += theme_bevel * 2;
+ RrMinsize(self->a_title, &self->title_min_w, &self->title_h);
+ self->title_min_w += ob_rr_theme->bevel * 2;
+ self->title_h += ob_rr_theme->bevel * 2;
self->size.width = MAX(self->size.width, self->title_min_w);
}
int h;
e->a_item->texture[0].data.text.string = e->label;
- appearance_minsize(e->a_item, &e->min_w, &self->item_h);
+ RrMinsize(e->a_item, &e->min_w, &self->item_h);
self->size.width = MAX(self->size.width, e->min_w);
e->a_disabled->texture[0].data.text.string = e->label;
- appearance_minsize(e->a_disabled, &e->min_w, &h);
+ RrMinsize(e->a_disabled, &e->min_w, &h);
self->item_h = MAX(self->item_h, h);
self->size.width = MAX(self->size.width, e->min_w);
e->a_hilite->texture[0].data.text.string = e->label;
- appearance_minsize(e->a_hilite, &e->min_w, &h);
+ RrMinsize(e->a_hilite, &e->min_w, &h);
self->item_h = MAX(self->item_h, h);
self->size.width = MAX(self->size.width, e->min_w);
- e->min_w += theme_bevel * 2;
+ e->min_w += ob_rr_theme->bevel * 2;
++nitems;
}
- self->bullet_w = self->item_h + theme_bevel;
- self->size.width += 2 * self->bullet_w + 2 * theme_bevel;
- self->item_h += theme_bevel * 2;
+ self->bullet_w = self->item_h + ob_rr_theme->bevel;
+ self->size.width += 2 * self->bullet_w + 2 * ob_rr_theme->bevel;
+ self->item_h += ob_rr_theme->bevel * 2;
items_h = self->item_h * MAX(nitems, 1);
- if (self->label) {
- RECT_SET(self->a_title->area, 0, 0, self->size.width,
- self->title_h);
- RECT_SET(self->a_title->texture[0].position, 0, 0, self->size.width,
- self->title_h);
- }
-
- RECT_SET(self->a_items->area, 0, 0, self->size.width, items_h);
-
XResizeWindow(ob_display, self->frame, self->size.width,
MAX(self->title_h + items_h, 1));
if (self->label)
- XMoveResizeWindow(ob_display, self->title, -theme_bwidth,
- -theme_bwidth, self->size.width, self->title_h);
+ XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth,
+ -ob_rr_theme->bwidth,
+ self->size.width, self->title_h);
XMoveResizeWindow(ob_display, self->items, 0,
- self->title_h + theme_bwidth, self->size.width,
+ self->title_h + ob_rr_theme->bwidth, self->size.width,
items_h);
if (self->label)
- paint(self->title, self->a_title);
- paint(self->items, self->a_items);
+ RrPaint(self->a_title, self->title, self->size.width, self->title_h);
+ RrPaint(self->a_items, self->items, self->size.width, items_h);
item_y = 0;
for (it = self->entries; it; it = it->next) {
void menu_entry_render(MenuEntry *self)
{
Menu *menu = self->parent;
- Appearance *a;
+ RrAppearance *a;
switch (self->render_type) {
case MenuEntryRenderType_Submenu:
break;
}
- RECT_SET(a->area, 0, 0, menu->size.width,
- menu->item_h);
- RECT_SET(a->texture[0].position, menu->bullet_w,
- 0, menu->size.width - 2 * menu->bullet_w,
- menu->item_h);
-
XMoveResizeWindow(ob_display, self->item, 0, self->y,
menu->size.width, menu->item_h);
- a->surface.data.planar.parent = menu->a_items;
- a->surface.data.planar.parentx = 0;
- a->surface.data.planar.parenty = self->y;
- paint(self->item, a);
+ a->surface.parent = menu->a_items;
+ a->surface.parentx = 0;
+ a->surface.parenty = self->y;
+
+ RrPaint(a, self->item, menu->size.width, menu->item_h);
}