summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Moreau <oreaus@gmail.com>2011-03-18 13:08:36 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-03-18 13:08:36 +0800
commit00a508cd491e834b802980174e7c0c8cec8acdac (patch)
tree3b2698e972dce1b3d288c3e9ad4e810ddf02db70 /src
parent1fb701594b78e950c031974d83c3566d1d648156 (diff)
downloadmobilebling-00a508cd491e834b802980174e7c0c8cec8acdac.tar.gz
mobilebling-00a508cd491e834b802980174e7c0c8cec8acdac.tar.bz2
If the root window gets focus, unset activeWindow before calling focusDefaultWindow to make sure the latter really focusses another window.
Forward port 33f695e7c6e4fb8ac627df0978fea7771fe1b3d5 to master
Diffstat (limited to 'src')
-rw-r--r--src/event.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/event.cpp b/src/event.cpp
index 6988423..acf80a2 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1889,14 +1889,14 @@ CompScreen::handleEvent (XEvent *event)
if (event->xfocus.window == priv->root)
{
+ priv->activeWindow = None;
+
if (event->xfocus.detail == NotifyDetailNone ||
(event->xfocus.mode == NotifyNormal &&
event->xfocus.detail == NotifyInferior))
{
screen->focusDefaultWindow ();
}
-
- priv->activeWindow = None;
}
if (priv->nextActiveWindow == event->xfocus.window)