diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-08-28 06:32:27 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-08-28 06:32:27 +0000 |
| commit | ffba11aeb059bef0b4876eb6aad2a8a24e2db6f1 (patch) | |
| tree | bc66e6ef487984bae5f3697aaa766b029358bbaf /openbox/menuframe.c | |
| parent | 615cbd96075905d75533f9b615c4ee6a75f4f9a4 (diff) | |
load menu plugins automatically from whats in the menu file
menu fixups
move enabled into the 'normal menu item' specific data stuff
Diffstat (limited to 'openbox/menuframe.c')
| -rw-r--r-- | openbox/menuframe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c index daecd6c4..832f49af 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -171,7 +171,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) RrAppearance *item_a, *text_a; gint th; /* temp */ - item_a = (!self->entry->enabled ? + item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + !self->entry->data.normal.enabled) ? self->a_disabled : (self == self->frame->selected ? self->a_selected : @@ -193,7 +194,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) item_a->surface.parenty = self->area.y; RrPaint(item_a, self->window, self->area.width, self->area.height); - text_a = (!self->entry->enabled ? + text_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + !self->entry->data.normal.enabled) ? self->a_text_disabled : (self == self->frame->selected ? self->a_text_selected : @@ -299,7 +301,8 @@ static void menu_frame_render(ObMenuFrame *self) RECT_SET_POINT(e->area, 0, allitems_h); XMoveWindow(ob_display, e->window, 0, e->area.y); - text_a = (!e->entry->enabled ? + text_a = ((e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + !e->entry->data.normal.enabled) ? e->a_text_disabled : (e == self->selected ? e->a_text_selected : |