aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-07-26 20:20:52 (GMT)
committermarkt <markt>2006-07-26 20:20:52 (GMT)
commit0954a0b61d067d86047d0755a64b953bd12e4c20 (patch)
tree6e062dea5e4da7beda598e69b7a1529e9fd41b9e
parente26706408083ab1bff1febe792236e6e2763e27b (diff)
downloadfluxbox_pavel-0954a0b61d067d86047d0755a64b953bd12e4c20.zip
fluxbox_pavel-0954a0b61d067d86047d0755a64b953bd12e4c20.tar.bz2
fix torn menus on exec
-rw-r--r--ChangeLog2
-rw-r--r--src/FbTk/Menu.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ded81aa..3e5618e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/26: 3*06/07/26:
4 * Fixed torn menus so they don't close on exec items (Mark)
5 FbTk/Menu.cc
4 * Updated pt_PT translations (Thanx Antonio Gomes) 6 * Updated pt_PT translations (Thanx Antonio Gomes)
5 nls/pt_PT/Translation.m 7 nls/pt_PT/Translation.m
6 * Added resource and menu item for maximizing over external tabs (Mark) 8 * Added resource and menu item for maximizing over external tabs (Mark)
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index e70fa76..3524ee1 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -564,7 +564,7 @@ void Menu::hide() {
564 p = p->m_parent; 564 p = p->m_parent;
565 565
566 p->internal_hide(); 566 p->internal_hide();
567 } else // if we dont have a parent then do hide here 567 } else if (!m_torn) // if we dont have a parent then do hide here
568 internal_hide(); 568 internal_hide();
569 569
570} 570}
@@ -898,7 +898,7 @@ void Menu::buttonReleaseEvent(XButtonEvent &re) {
898 } 898 }
899 899
900 if (re.button == 3) 900 if (re.button == 3)
901 hide(); 901 internal_hide();
902 902
903 } else if (re.window == menu.frame) { 903 } else if (re.window == menu.frame) {
904 904