aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-03-19 06:18:25 (GMT)
committermarkt <markt>2007-03-19 06:18:25 (GMT)
commitd7eebb62bd02b491f81811242a17bd134792b3d9 (patch)
tree27649cfa857534302fb487f6961af28355398a28
parent063468ea6603aaf866e5d52d4f06bfb0714f1b2f (diff)
downloadfluxbox_pavel-d7eebb62bd02b491f81811242a17bd134792b3d9.zip
fluxbox_pavel-d7eebb62bd02b491f81811242a17bd134792b3d9.tar.bz2
active menu item wasn't getting reset properly when closed from [exec] with buttonpress
-rw-r--r--ChangeLog2
-rw-r--r--src/FbTk/Menu.cc8
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d46c3fa..de5d99b 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*07/03/19: 3*07/03/19:
4 * Active menu item wasn't getting reset properly when menu closed (Mark)
5 FbTk/Menu.cc
4 * Fixed some problems with toolbar sizing (Mark + thanks Julien Trolet) 6 * Fixed some problems with toolbar sizing (Mark + thanks Julien Trolet)
5 Toolbar.cc 7 Toolbar.cc
6*07/03/18: 8*07/03/18:
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 1162b53..008eebd 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -883,11 +883,11 @@ void Menu::buttonReleaseEvent(XButtonEvent &re) {
883 re.x > ix && re.x < (signed) (ix + menu.item_w) && 883 re.x > ix && re.x < (signed) (ix + menu.item_w) &&
884 re.y > iy && re.y < (signed) (iy + theme().itemHeight())) { 884 re.y > iy && re.y < (signed) (iy + theme().itemHeight())) {
885 menuitems[w]->click(re.button, re.time); 885 menuitems[w]->click(re.button, re.time);
886 } else {
887 int old = m_active_index;
888 m_active_index = w;
889 clearItem(old);
886 } 890 }
887
888 int old = m_active_index;
889 m_active_index = w;
890 clearItem(old);
891 clearItem(w); 891 clearItem(w);
892 } 892 }
893 } 893 }