Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 22 insertions, 5 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 7cf2ac9..ded5dab 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -328,9 +328,11 @@ void Menu::cycleItems(bool reverse) {
             new_index = vec[i]->getIndex();
     }
 
-    if (new_index == -1)
-        return;
+    if (new_index != -1)
+        setActiveIndex(new_index);
+}
 
+void Menu::setActiveIndex(int new_index) {
     // clear the items and close any open submenus
     int old_active_index = m_active_index;
     m_active_index = new_index;
@@ -757,7 +759,7 @@ void Menu::drawSubmenu(unsigned int index) {
         if (! m_moving)
             clearItem(index);
 
-        if (! item->submenu()->isVisible()) {
+        if (! item->submenu()->isVisible() && item->submenu()->numberOfItems() > 0) {
             shown = item->submenu();
             item->showSubmenu();
             item->submenu()->raise();
@@ -1065,11 +1067,26 @@ void Menu::keyPressEvent(XKeyEvent &event) {
         break;
     case XK_Left: // enter parent if we have one
         resetTypeAhead();
-        internal_hide();
+        if (menu.sublevels > 1 && m_active_index >= menu.persub) {
+            int new_index = m_active_index - menu.persub;
+            while (new_index >= 0 && !isItemEnabled(new_index))
+                new_index -= menu.persub;
+            if (new_index >= 0)
+                setActiveIndex(new_index);
+        } else
+            internal_hide();
         break;
     case XK_Right: // enter submenu if we have one
         resetTypeAhead();
-        enterSubmenu();
+        if (menu.sublevels > 1 && validIndex(m_active_index) &&
+            validIndex(m_active_index + menu.persub)) {
+            int new_index = m_active_index + menu.persub;
+            while (validIndex(new_index) && !isItemEnabled(new_index))
+                new_index += menu.persub;
+            if (validIndex(new_index))
+                setActiveIndex(new_index);
+        } else
+            enterSubmenu();
         break;
     case XK_Escape: // close menu
         m_type_ahead.reset();