diff options
author | akir <akir> | 2004-08-30 10:23:37 (GMT) |
---|---|---|
committer | akir <akir> | 2004-08-30 10:23:37 (GMT) |
commit | 6a9942733130270c347650ab90adc9f2459b02cd (patch) | |
tree | ef56227cf1f4bf11f7febd1e53345ac4a8d321b0 /src/FbTk | |
parent | 76d09504db06dae431d24ce0d903b55757707854 (diff) | |
download | fluxbox-6a9942733130270c347650ab90adc9f2459b02cd.zip fluxbox-6a9942733130270c347650ab90adc9f2459b02cd.tar.bz2 |
fi menuuclosebug -> choosed the wrong parent-menu under some circumstances
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/Menu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 7e89016..e03d783 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Menu.cc,v 1.77 2004/08/29 14:53:23 rathnor Exp $ | 25 | // $Id: Menu.cc,v 1.78 2004/08/30 10:23:37 akir Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -656,8 +656,9 @@ void Menu::hide() { | |||
656 | if (!torn && m_parent && m_parent->isVisible()) { | 656 | if (!torn && m_parent && m_parent->isVisible()) { |
657 | Menu *p = m_parent; | 657 | Menu *p = m_parent; |
658 | 658 | ||
659 | while (p->isVisible() && (! p->torn) && p->m_parent) | 659 | while ((! p->torn) && p->m_parent && p->m_parent->isVisible()) |
660 | p = p->m_parent; | 660 | p = p->m_parent; |
661 | |||
661 | p->internal_hide(); | 662 | p->internal_hide(); |
662 | } else // if we dont have a parent then do hide here | 663 | } else // if we dont have a parent then do hide here |
663 | internal_hide(); | 664 | internal_hide(); |
@@ -669,7 +670,6 @@ void Menu::grabInputFocus() { | |||
669 | 670 | ||
670 | // grab input focus | 671 | // grab input focus |
671 | menu.window.setInputFocus(RevertToPointerRoot, CurrentTime); | 672 | menu.window.setInputFocus(RevertToPointerRoot, CurrentTime); |
672 | |||
673 | } | 673 | } |
674 | 674 | ||
675 | 675 | ||