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

ignore enter events on top menu and submenu popup

Browse source
This commit is contained in:
Dana Jansens 2007-05-12 19:50:32 +00:00
parent ab75dd8672
commit c2e4d42e6d
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
openbox/menuframe.c
View file

@ -932,6 +932,7 @@ static gboolean menu_frame_show(ObMenuFrame *self)
gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y, gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
gint button) gint button)
{ {
gint px, py;
guint i; guint i;
if (menu_frame_is_visible(self)) if (menu_frame_is_visible(self))
@ -957,14 +958,20 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
XMapWindow(ob_display, self->window); XMapWindow(ob_display, self->window);
if (screen_pointer_pos(&px, &py)) {
ObMenuEntryFrame *e = menu_entry_frame_under(px, py);
if (e && e->frame == self)
e->ignore_enters++;
}
return TRUE; return TRUE;
} }
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent, gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
ObMenuEntryFrame *parent_entry) ObMenuEntryFrame *parent_entry)
{ {
ObMenuEntryFrame *e;
gint x, y, dx, dy; gint x, y, dx, dy;
gint px, py;
if (menu_frame_is_visible(self)) if (menu_frame_is_visible(self))
return TRUE; return TRUE;
@ -994,9 +1001,11 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
XMapWindow(ob_display, self->window); XMapWindow(ob_display, self->window);
if (screen_pointer_pos(&dx, &dy) && (e = menu_entry_frame_under(dx, dy)) && if (screen_pointer_pos(&px, &py)) {
e->frame == self) ObMenuEntryFrame *e = menu_entry_frame_under(px, py);
++e->ignore_enters; if (e && e->frame == self)
e->ignore_enters++;
}
return TRUE; return TRUE;
} }
@ -1086,7 +1095,7 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y)
ObMenuEntryFrame *e = it->data; ObMenuEntryFrame *e = it->data;
if (RECT_CONTAINS(e->area, x, y)) { if (RECT_CONTAINS(e->area, x, y)) {
ret = e; ret = e;
break; break;
} }
} }