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

add a func to find a menu entry from a submenu.

Browse source 
keep menu entries highlighted while they have their submenu open
This commit is contained in:
Dana Jansens 2003-07-22 16:41:08 +00:00
parent 31cdb95963
commit 56527d41b7
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
openbox/menu.c
View file

@ -51,11 +51,10 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
while (node) { while (node) {
if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) { if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) {
if (parse_attr_string("plugin", node, &plugin)) { if (parse_attr_string("plugin", node, &plugin)) {
PluginMenuCreateData data = { PluginMenuCreateData data;
.doc = doc, data.doc = doc;
.node = node, data.node = node;
.parent = menu data.parent = menu;
};
parent = plugin_create(plugin, &data); parent = plugin_create(plugin, &data);
g_free(plugin); g_free(plugin);
} else { } else {
@ -393,6 +392,18 @@ ObMenuEntry *menu_find_entry(ObMenu *menu, Window win)
return NULL; return NULL;
} }
ObMenuEntry *menu_find_entry_by_submenu(ObMenu *menu, ObMenu *submenu)
{
GList *it;
for (it = menu->entries; it; it = it->next) {
ObMenuEntry *entry = it->data;
if (entry->submenu == submenu)
return entry;
}
return NULL;
}
ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y) ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y)
{ {
if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height) if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height)
@ -457,13 +468,18 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
{ {
int x; int x;
Rect *a; Rect *a;
ObMenuEntry *e;
self->hilite = enter;
if (enter) { if (enter) {
if (self->parent->open_submenu && self->submenu if (self->parent->open_submenu && self->submenu
!= self->parent->open_submenu) != self->parent->open_submenu)
{
e = menu_find_entry_by_submenu(self->parent,
self->parent->open_submenu);
e->hilite = FALSE;
menu_entry_render(e);
menu_hide(self->parent->open_submenu); menu_hide(self->parent->open_submenu);
}
if (self->submenu && self->parent->open_submenu != self->submenu) { if (self->submenu && self->parent->open_submenu != self->submenu) {
self->parent->open_submenu = self->submenu; self->parent->open_submenu = self->submenu;
@ -489,6 +505,11 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
self->parent->client); self->parent->client);
} }
} }
if (enter || !self->submenu ||
menu_find_entry_by_submenu(self->parent,
self->parent->open_submenu) != self)
self->hilite = enter;
} }
ObMenuEntry *menu_control_keyboard_nav(ObMenuEntry *over, ObKey key) ObMenuEntry *menu_control_keyboard_nav(ObMenuEntry *over, ObKey key)