nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

give labeled separators borders

Browse source
This commit is contained in:
Dana Jansens 2007-04-22 03:13:41 +00:00
parent 73b490f614
commit 51c3c8c34a
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
openbox/menuframe.c
View file

@ -463,6 +463,7 @@ static void menu_frame_render(ObMenuFrame *self)
GList *it; GList *it;
gboolean has_icon = FALSE; gboolean has_icon = FALSE;
ObMenu *sub; ObMenu *sub;
ObMenuEntryFrame *e;
XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth); XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth);
XSetWindowBorder(ob_display, self->window, XSetWindowBorder(ob_display, self->window,
@ -513,10 +514,28 @@ static void menu_frame_render(ObMenuFrame *self)
for (it = self->entries; it; it = g_list_next(it)) { for (it = self->entries; it; it = g_list_next(it)) {
RrAppearance *text_a; RrAppearance *text_a;
ObMenuEntryFrame *e = it->data; e = it->data;
RECT_SET_POINT(e->area, 0, h); /* if the first entry is a labeled separator, then make its border
XMoveWindow(ob_display, e->window, 0, e->area.y); overlap with the menu's outside border */
if (it == self->entries &&
e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR &&
e->entry->data.separator.label)
{
h -= ob_rr_theme->mbwidth;
}
if (e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR &&
e->entry->data.separator.label)
{
e->border = ob_rr_theme->mbwidth;
}
RECT_SET_POINT(e->area, 0, h+e->border);
XMoveWindow(ob_display, e->window, e->area.x-e->border, e->area.y-e->border);
XSetWindowBorderWidth(ob_display, e->window, e->border);
XSetWindowBorder(ob_display, e->window,
RrColorPixel(ob_rr_theme->menu_b_color));
text_a = ((e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && text_a = ((e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
!e->entry->data.normal.enabled) ? !e->entry->data.normal.enabled) ?
@ -552,6 +571,7 @@ static void menu_frame_render(ObMenuFrame *self)
e->entry->data.separator.label; e->entry->data.separator.label;
RrMinsize(self->a_title, &tw, &th); RrMinsize(self->a_title, &tw, &th);
tw = MIN(tw, MAX_MENU_WIDTH); tw = MIN(tw, MAX_MENU_WIDTH);
th += ob_rr_theme->mbwidth * 2;
} else { } else {
tw = 0; tw = 0;
th = SEPARATOR_HEIGHT; th = SEPARATOR_HEIGHT;
@ -564,6 +584,16 @@ static void menu_frame_render(ObMenuFrame *self)
h += th; h += th;
} }
/* if the last entry is a labeled separator, then make its border
overlap with the menu's outside border */
it = g_list_last(self->entries);
e = it ? it->data : NULL;
if (e && e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR &&
e->entry->data.separator.label)
{
h -= ob_rr_theme->mbwidth;
}
self->text_x = PADDING; self->text_x = PADDING;
self->text_w = w; self->text_w = w;

1
openbox/menuframe.h
View file

@ -80,6 +80,7 @@ struct _ObMenuEntryFrame
guint ignore_enters; guint ignore_enters;
Rect area; Rect area;
gint border;
Window window; Window window;
Window icon; Window icon;