aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/FbTk/Menu.cc6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a82ad72..51199bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.10: 2Changes for 0.9.10:
3*04/08/30:
4 * Fix bug in menu-closing with keys (Mathias)
5 FbTk/Menu.cc
3*04/08/29: 6*04/08/29:
4 * Added [wallpapers|wallpapermenu|rootcommands] to possible 7 * Added [wallpapers|wallpapermenu|rootcommands] to possible
5 menuitems (Mathias) 8 menuitems (Mathias)
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