aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/FbTk/Menu.cc
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/FbTk/Menu.cc')
-rw-r--r--src/FbTk/Menu.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index b0fcb4b..23efcfe 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -357,10 +357,6 @@ void Menu::enterSubmenu() {
357 submenu->cycleItems(false); 357 submenu->cycleItems(false);
358} 358}
359 359
360void Menu::enterParent() {
361 internal_hide();
362}
363
364void Menu::disableTitle() { 360void Menu::disableTitle() {
365 setTitleVisibility(false); 361 setTitleVisibility(false);
366} 362}
@@ -1033,7 +1029,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
1033 break; 1029 break;
1034 case XK_Left: // enter parent if we have one 1030 case XK_Left: // enter parent if we have one
1035 resetTypeAhead(); 1031 resetTypeAhead();
1036 enterParent(); 1032 internal_hide();
1037 break; 1033 break;
1038 case XK_Right: // enter submenu if we have one 1034 case XK_Right: // enter submenu if we have one
1039 resetTypeAhead(); 1035 resetTypeAhead();
@@ -1046,7 +1042,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
1046 break; 1042 break;
1047 case XK_BackSpace: 1043 case XK_BackSpace:
1048 if (m_type_ahead.stringSize() == 0) { 1044 if (m_type_ahead.stringSize() == 0) {
1049 enterParent(); 1045 internal_hide();
1050 break; 1046 break;
1051 } 1047 }
1052 1048