summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-03-07 02:09:24 (GMT)
committermarkt <markt>2007-03-07 02:09:24 (GMT)
commit4ed76f99b61a65356c63d13c526e8e04642ea053 (patch)
treef9bddaf9feeeb6d08c00474fdc576e371a589eb0
parent82f02f44c590e6eb04b2b6211bc602cd75210524 (diff)
downloadfluxbox_lack-4ed76f99b61a65356c63d13c526e8e04642ea053.zip
fluxbox_lack-4ed76f99b61a65356c63d13c526e8e04642ea053.tar.bz2
don't mark menu as focused, even if it gets a FocusIn, when it's not visible
-rw-r--r--ChangeLog5
-rw-r--r--src/FbTk/Menu.cc4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f3e0c0..7903cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/03/07:
4 * Fixed a little bug with reverting focus after closing menu (Mark)
5 FbTk/Menu.cc
3*07/03/06: 6*07/03/06:
4 * changed some handling of focusing/raising transient windows (Mark) 7 * Changed some handling of focusing/raising transient windows (Mark)
5 Window.cc FocusControl.cc 8 Window.cc FocusControl.cc
6 * session.screen<N>.defaultDeco now allows same strings as apps file (Mark) 9 * session.screen<N>.defaultDeco now allows same strings as apps file (Mark)
7 Screen.cc/hh Window.cc Remember.cc/hh 10 Screen.cc/hh Window.cc Remember.cc/hh
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 163fc83..a2326c4 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -816,7 +816,9 @@ void Menu::handleEvent(XEvent &event) {
816 if (event.type == FocusOut) { 816 if (event.type == FocusOut) {
817 if (s_focused == this) 817 if (s_focused == this)
818 s_focused = 0; 818 s_focused = 0;
819 } else if (event.type == FocusIn) { 819 // I don't know why, but I get a FocusIn event when closing the menu with
820 // the mouse over it -- probably an xorg bug, but it's easy to address here
821 } else if (event.type == FocusIn && m_visible) {
820 if (s_focused != this) 822 if (s_focused != this)
821 s_focused = this; 823 s_focused = this;
822 // if there's a submenu open, focus it instead 824 // if there's a submenu open, focus it instead