diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-09-01 02:30:12 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-09-01 02:30:12 +0000 |
| commit | d7b4f1b126aaafdc6f2d76c2126e0d7be6d10687 (patch) | |
| tree | d84031f46ede22f87566ad59cad739e41d95ccc3 | |
| parent | 9d42df6ab4099c9365d3631ea86348a8f21752a0 (diff) | |
make separators span the width of the entire menu
| -rw-r--r-- | openbox/menuframe.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c index e27bde01..8ba70fbe 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -94,9 +94,11 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, attr.event_mask = ENTRY_EVENTMASK; self->window = createWindow(self->frame->items, CWEventMask, &attr); - self->icon = createWindow(self->window, 0, NULL); self->text = createWindow(self->window, 0, NULL); - self->bullet = createWindow(self->window, 0, NULL); + if (entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) { + self->icon = createWindow(self->window, 0, NULL); + self->bullet = createWindow(self->window, 0, NULL); + } XMapWindow(ob_display, self->window); XMapWindow(ob_display, self->text); @@ -129,10 +131,12 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, static void menu_entry_frame_free(ObMenuEntryFrame *self) { if (self) { - XDestroyWindow(ob_display, self->icon); XDestroyWindow(ob_display, self->text); - XDestroyWindow(ob_display, self->bullet); XDestroyWindow(ob_display, self->window); + if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) { + XDestroyWindow(ob_display, self->icon); + XDestroyWindow(ob_display, self->bullet); + } RrAppearanceFree(self->a_normal); RrAppearanceFree(self->a_disabled); @@ -256,22 +260,20 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) self->frame->item_h - 2*PADDING); break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - XMoveResizeWindow(ob_display, self->text, - self->frame->text_x, PADDING, - self->frame->text_w - 2*PADDING, - SEPARATOR_HEIGHT); + XMoveResizeWindow(ob_display, self->text, PADDING, PADDING, + self->area.width - 2*PADDING, SEPARATOR_HEIGHT); self->a_separator->surface.parent = item_a; - self->a_separator->surface.parentx = self->frame->text_x; + self->a_separator->surface.parentx = PADDING; 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->area.width - 4*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); + self->area.width - 2*PADDING, SEPARATOR_HEIGHT); break; } |