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

more little changes to typeahead (thanks Matteo, plus changes from me)

Browse source
This commit is contained in:
markt 2007-03-04 18:22:25 +00:00
parent 0d02b9bdf3
commit b9e39764f3
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/FbTk/Menu.cc
View file

@ -352,20 +352,9 @@ void Menu::enterSubmenu() {
}
void Menu::enterParent() {
if (parent() == 0)
return;
if (validIndex(m_active_index)) {
Menu *submenu = menuitems[m_active_index]->submenu();
if (submenu)
submenu->internal_hide();
}
m_active_index = -1;
// hide self
m_visible = false;
menu.window.hide();
internal_hide();
// return focus to parent
if (parent())
parent()->grabInputFocus();
}
@ -1038,6 +1027,11 @@ void Menu::keyPressEvent(XKeyEvent &event) {
hide();
break;
case XK_BackSpace:
if (m_type_ahead.stringSize() == 0) {
enterParent();
break;
}
m_type_ahead.putBackSpace();
drawTypeAheadItems();
break;
@ -1059,8 +1053,14 @@ void Menu::keyPressEvent(XKeyEvent &event) {
break;
case XK_Tab:
case XK_ISO_Left_Tab:
if (validIndex(m_active_index) && isItemEnabled(m_active_index) &&
menuitems[m_active_index]->submenu() && m_matches.size() == 1) {
enterSubmenu();
m_type_ahead.reset();
} else {
m_type_ahead.seek();
cycleItems((bool)(event.state & ShiftMask));
}
drawTypeAheadItems();
break;
default: