summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-08-29 08:51:05 +0000
committerDana Jansens <danakj@orodu.net>2003-08-29 08:51:05 +0000
commit09f4a0c51a6ee5a04bffd719f4d18f762d338d43 (patch)
treef0425d1c6c71630e52c640445611c0ff3d1ad1cc /openbox
parent7317d17c76f3f38f92768541cb0fe370f9c88616 (diff)
dont keyboard nav onto disabled menu items
Diffstat (limited to 'openbox')
-rw-r--r--openbox/menuframe.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 0b90df6e..811d4c05 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -643,7 +643,10 @@ void menu_frame_select_previous(ObMenuFrame *self)
if (it) {
e = it->data;
- if (e->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR)
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+ break;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+ e->entry->data.normal.enabled)
break;
}
}
@@ -666,7 +669,10 @@ void menu_frame_select_next(ObMenuFrame *self)
if (it) {
e = it->data;
- if (e->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR)
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+ break;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+ e->entry->data.normal.enabled)
break;
}
}