aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2009-09-23 20:21:13 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2009-09-23 20:21:13 (GMT)
commit4663a9591e08b554f82366cdd8e9075b0a6fbe55 (patch)
tree31d68447b63ce42c90aad579563a17e52ef55af5
parentcfd055064a6b02f05aa6b77d7d26a9b33ad8a1eb (diff)
downloadfluxbox-4663a9591e08b554f82366cdd8e9075b0a6fbe55.zip
fluxbox-4663a9591e08b554f82366cdd8e9075b0a6fbe55.tar.bz2
bugfix: 'HideMenus' command did not work if the user 'opened' an empty submenu.
'openeing' such an empty submenu lead to an already hidden menu referenced by the 'shown' pointer
-rw-r--r--ChangeLog5
-rw-r--r--src/FbTk/Menu.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb758e8..7b875bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1.2 2Changes for 1.1.2
3
4*09/09/23:
5 * Bugfix: Empty submenus lead to misfunction of the 'HideMenus' command (Mathias)
6 FbTk/Menu.cc
7
3*09/09/12: 8*09/09/12:
4 * Implemented visibility of titlebar buttons via the apps file (Mathias) 9 * Implemented visibility of titlebar buttons via the apps file (Mathias)
5 Window.cc 10 Window.cc
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 4489d0f..ded5dab 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -759,7 +759,7 @@ void Menu::drawSubmenu(unsigned int index) {
759 if (! m_moving) 759 if (! m_moving)
760 clearItem(index); 760 clearItem(index);
761 761
762 if (! item->submenu()->isVisible()) { 762 if (! item->submenu()->isVisible() && item->submenu()->numberOfItems() > 0) {
763 shown = item->submenu(); 763 shown = item->submenu();
764 item->showSubmenu(); 764 item->showSubmenu();
765 item->submenu()->raise(); 765 item->submenu()->raise();