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

place submenus with their borders over the parent's

Browse source
This commit is contained in:
Dana Jansens 2003-08-29 05:49:30 +00:00
parent 735776321c
commit db4b0e6270
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
openbox/menuframe.c
View file

@ -225,7 +225,6 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
switch (self->entry->type) { switch (self->entry->type) {
case OB_MENU_ENTRY_TYPE_NORMAL: case OB_MENU_ENTRY_TYPE_NORMAL:
case OB_MENU_ENTRY_TYPE_SUBMENU:
XMoveResizeWindow(ob_display, self->text, XMoveResizeWindow(ob_display, self->text,
self->frame->text_x, 0, self->frame->text_x, 0,
self->frame->text_w, self->frame->item_h); self->frame->text_w, self->frame->item_h);
@ -235,6 +234,18 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
RrPaint(text_a, self->text, self->frame->text_w, self->frame->item_h); RrPaint(text_a, self->text, self->frame->text_w, self->frame->item_h);
XMapWindow(ob_display, self->text); XMapWindow(ob_display, self->text);
break; break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
XMoveResizeWindow(ob_display, self->text,
self->frame->text_x, 0,
self->frame->text_w - self->frame->item_h,
self->frame->item_h);
text_a->surface.parent = item_a;
text_a->surface.parentx = self->frame->text_x;
text_a->surface.parenty = 0;
RrPaint(text_a, self->text, self->frame->text_w - self->frame->item_h,
self->frame->item_h);
XMapWindow(ob_display, self->text);
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR: case OB_MENU_ENTRY_TYPE_SEPARATOR:
XUnmapWindow(ob_display, self->text); XUnmapWindow(ob_display, self->text);
break; break;
@ -262,11 +273,12 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
XMoveResizeWindow(ob_display, self->bullet, XMoveResizeWindow(ob_display, self->bullet,
self->frame->text_x + self->frame->text_w, 0, self->frame->text_x + self->frame->text_w
- self->frame->item_h, 0,
self->frame->item_h, self->frame->item_h); self->frame->item_h, self->frame->item_h);
self->a_bullet->surface.parent = item_a; self->a_bullet->surface.parent = item_a;
self->a_bullet->surface.parentx = self->a_bullet->surface.parentx =
self->frame->text_x + self->frame->text_w; self->frame->text_x + self->frame->text_w - self->frame->item_h;
self->a_bullet->surface.parenty = 0; self->a_bullet->surface.parenty = 0;
RrPaint(self->a_bullet, self->bullet, RrPaint(self->a_bullet, self->bullet,
self->frame->item_h, self->frame->item_h); self->frame->item_h, self->frame->item_h);
@ -281,7 +293,7 @@ static void menu_frame_render(ObMenuFrame *self)
gint allitems_h = 0; gint allitems_h = 0;
gint tw, th; /* temps */ gint tw, th; /* temps */
GList *it; GList *it;
gboolean has_icon = FALSE, has_bullet = FALSE; gboolean has_icon = FALSE;
ObMenu *sub; ObMenu *sub;
XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->bwidth); XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->bwidth);
@ -338,7 +350,7 @@ static void menu_frame_render(ObMenuFrame *self)
text_a->texture[0].data.text.string = sub ? sub->title : ""; text_a->texture[0].data.text.string = sub ? sub->title : "";
RrMinsize(text_a, &tw, &th); RrMinsize(text_a, &tw, &th);
has_bullet = TRUE; tw += self->item_h;
break; break;
case OB_MENU_ENTRY_TYPE_SEPARATOR: case OB_MENU_ENTRY_TYPE_SEPARATOR:
tw = 0; tw = 0;
@ -354,8 +366,6 @@ static void menu_frame_render(ObMenuFrame *self)
self->text_w = w; self->text_w = w;
if (self->entries) { if (self->entries) {
if (has_bullet)
w += self->item_h;
if (has_icon) { if (has_icon) {
w += self->item_h; w += self->item_h;
self->text_x += self->item_h; self->text_x += self->item_h;
@ -581,7 +591,7 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self)
self->frame->client); self->frame->client);
menu_frame_move(f, menu_frame_move(f,
self->frame->area.x + self->frame->area.width self->frame->area.x + self->frame->area.width
- ob_rr_theme->menu_overlap, - ob_rr_theme->menu_overlap - ob_rr_theme->bwidth,
self->frame->area.y + self->frame->title_h + self->frame->area.y + self->frame->title_h +
self->area.y + ob_rr_theme->menu_overlap); self->area.y + ob_rr_theme->menu_overlap);
menu_frame_show(f, self->frame); menu_frame_show(f, self->frame);