#include "render/theme.h"
#define PADDING 2
-#define SEPARATOR_HEIGHT 5
+#define SEPARATOR_HEIGHT 3
#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\
LeaveWindowMask)
self->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled);
self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_hilite);
- self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
- self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
- self->a_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet);
- self->a_bullet->texture[0].type = RR_TEXTURE_MASK;
+ if (entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) {
+ self->a_separator = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+ self->a_separator->texture[0].type = RR_TEXTURE_LINE_ART;
+ } else {
+ self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+ self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
+ self->a_mask = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+ self->a_mask->texture[0].type = RR_TEXTURE_MASK;
+ self->a_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet);
+ }
self->a_text_normal =
RrAppearanceCopy(ob_rr_theme->a_menu_text_item);
RrAppearanceFree(self->a_disabled);
RrAppearanceFree(self->a_selected);
+ RrAppearanceFree(self->a_separator);
RrAppearanceFree(self->a_icon);
+ RrAppearanceFree(self->a_mask);
RrAppearanceFree(self->a_text_normal);
RrAppearanceFree(self->a_text_disabled);
RrAppearanceFree(self->a_text_selected);
th = self->frame->item_h;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
- th = SEPARATOR_HEIGHT;
+ th = SEPARATOR_HEIGHT + 2*PADDING;
break;
}
RECT_SET_SIZE(self->area, self->frame->inner_w, th);
text_a->surface.parenty = PADDING;
RrPaint(text_a, self->text, self->frame->text_w,
self->frame->item_h - 2*PADDING);
- XMapWindow(ob_display, self->text);
break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
XMoveResizeWindow(ob_display, self->text,
text_a->surface.parenty = PADDING;
RrPaint(text_a, self->text, self->frame->text_w - self->frame->item_h,
self->frame->item_h - 2*PADDING);
- XMapWindow(ob_display, self->text);
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
- XUnmapWindow(ob_display, self->text);
+ XMoveResizeWindow(ob_display, self->text,
+ self->frame->text_x, PADDING,
+ self->frame->text_w - 2*PADDING,
+ SEPARATOR_HEIGHT);
+ self->a_separator->surface.parent = item_a;
+ self->a_separator->surface.parentx = self->frame->text_x;
+ self->a_separator->surface.parenty = PADDING;
+ self->a_separator->texture[0].data.lineart.color =
+ text_a->texture[0].data.text.color;
+ self->a_separator->texture[0].data.lineart.x1 = 2*PADDING;
+ self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT / 2;
+ self->a_separator->texture[0].data.lineart.x2 =
+ self->frame->text_w - 6*PADDING;
+ self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2;
+ RrPaint(self->a_separator, self->text,
+ self->frame->text_w - 2*PADDING, SEPARATOR_HEIGHT);
break;
}
- if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+ if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
self->entry->data.normal.icon_data)
{
XMoveResizeWindow(ob_display, self->icon, PADDING, 0,
RrPaint(self->a_icon, self->icon,
self->frame->item_h, self->frame->item_h);
XMapWindow(ob_display, self->icon);
+ } else if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
+ self->entry->data.normal.mask)
+ {
+ XMoveResizeWindow(ob_display, self->icon, PADDING, 0,
+ self->frame->item_h,
+ self->frame->item_h);
+ self->a_mask->texture[0].data.mask.mask =
+ self->entry->data.normal.mask;
+ self->a_mask->texture[0].data.mask.color =
+ self->entry->data.normal.mask_color;
+ self->a_mask->surface.parent = item_a;
+ self->a_mask->surface.parentx = PADDING;
+ self->a_mask->surface.parenty = 0;
+ RrPaint(self->a_mask, self->icon,
+ self->frame->item_h, self->frame->item_h);
+ XMapWindow(ob_display, self->icon);
} else
XUnmapWindow(ob_display, self->icon);
text_a->texture[0].data.text.string = e->entry->data.normal.label;
RrMinsize(text_a, &tw, &th);
- if (e->entry->data.normal.icon_data)
+ if (e->entry->data.normal.icon_data ||
+ e->entry->data.normal.mask)
has_icon = TRUE;
break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
text_a->texture[0].data.text.string = sub ? sub->title : "";
RrMinsize(text_a, &tw, &th);
+ if (e->entry->data.normal.icon_data ||
+ e->entry->data.normal.mask)
+ has_icon = TRUE;
+
tw += self->item_h - PADDING;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR: