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

forgot about the menu

Browse source
This commit is contained in:
markt 2006-07-23 13:30:46 +00:00
parent be2f40a10d
commit 538b630ff2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/fluxbox.cc
View file

@ -679,13 +679,12 @@ void Fluxbox::handleEvent(XEvent * const e) {
FbTk::Menu::focused()->window() == e->xfocus.window) { FbTk::Menu::focused()->window() == e->xfocus.window) {
// find screen num // find screen num
BScreen *screen = 0;
ScreenList::iterator it = m_screen_list.begin(); ScreenList::iterator it = m_screen_list.begin();
ScreenList::iterator it_end = m_screen_list.end(); ScreenList::iterator it_end = m_screen_list.end();
for (; it != it_end; ++it) { for (; it != it_end; ++it) {
if ( (*it)->screenNumber() == if ( (*it)->screenNumber() ==
FbTk::Menu::focused()->fbwindow().screenNumber()) { FbTk::Menu::focused()->fbwindow().screenNumber()) {
screen = (*it); FocusControl::revertFocus(**it);
break; // found the screen, no more search break; // found the screen, no more search
} }
} }
@ -1786,7 +1785,8 @@ void Fluxbox::timed_reconfigure() {
} }
void Fluxbox::revert_focus() { void Fluxbox::revert_focus() {
if (m_revert_screen && !FocusControl::focusedWindow()) if (m_revert_screen && !FocusControl::focusedWindow() &&
!FbTk::Menu::focused())
FocusControl::revertFocus(*m_revert_screen); FocusControl::revertFocus(*m_revert_screen);
} }