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

fix torn menus

Browse source
This commit is contained in:
Mark Tiefenbruck 2007-12-17 22:52:30 -08:00
parent c01bd6e9fd
commit 98c5cea5f5
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/FbTk/Menu.cc
View file

@ -515,24 +515,28 @@ void Menu::show() {
menu.window.show(); menu.window.show();
raise(); raise();
if (shown && shown != this && shown != m_parent) if (shown && shown != this)
shown->hide(); shown->hide();
shown = this; shown = this;
} }
void Menu::hide() { void Menu::hide(bool force) {
if (!isVisible()) if (!isVisible())
return; return;
// if parent is visible, go to first parent and hide it // if parent is visible, go to first parent and hide it
Menu *p = this; Menu *p = this;
while (p->m_parent && p->m_parent->isVisible()) while (p && p->isVisible()) {
p = p->m_parent; Menu *tmp = p->m_parent;
if (force || !p->m_torn)
p->internal_hide(); p->internal_hide();
else
p->m_parent = 0;
p = tmp;
}
} }
@ -570,12 +574,10 @@ void Menu::redrawFrame(FbDrawable &drawable) {
void Menu::internal_hide(bool first) { void Menu::internal_hide(bool first) {
if (!first && m_torn)
return;
if (validIndex(m_which_sub)) { if (validIndex(m_which_sub)) {
MenuItem *tmp = menuitems[m_which_sub]; MenuItem *tmp = menuitems[m_which_sub];
tmp->submenu()->internal_hide(false); if (tmp && tmp->submenu() && tmp->submenu()->isVisible())
tmp->submenu()->internal_hide(false);
} }
// if we have an active index we need to redraw it // if we have an active index we need to redraw it
@ -719,6 +721,7 @@ void Menu::drawSubmenu(unsigned int index) {
clearItem(index); clearItem(index);
if (! item->submenu()->isVisible()) { if (! item->submenu()->isVisible()) {
shown = item->submenu();
item->showSubmenu(); item->showSubmenu();
item->submenu()->raise(); item->submenu()->raise();
} }
@ -908,6 +911,8 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
if (! m_moving) { if (! m_moving) {
// if not m_moving: start m_moving operation // if not m_moving: start m_moving operation
m_moving = m_torn = true; m_moving = m_torn = true;
if (m_parent)
m_parent->m_which_sub = -1;
// clear current highlighted item // clear current highlighted item
clearItem(m_active_index); clearItem(m_active_index);
@ -1033,7 +1038,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
case XK_Escape: // close menu case XK_Escape: // close menu
m_type_ahead.reset(); m_type_ahead.reset();
m_torn = false; m_torn = false;
hide(); hide(true);
break; break;
case XK_BackSpace: case XK_BackSpace:
if (m_type_ahead.stringSize() == 0) { if (m_type_ahead.stringSize() == 0) {

2
src/FbTk/Menu.hh
View file

@ -124,7 +124,7 @@ public:
/// show menu /// show menu
virtual void show(); virtual void show();
/// hide menu /// hide menu
virtual void hide(); virtual void hide(bool force = false);
virtual void clearWindow(); virtual void clearWindow();
#ifdef NOT_USED #ifdef NOT_USED
void setActiveIndex(int index) { m_active_index = index; } void setActiveIndex(int index) { m_active_index = index; }