summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/display.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e892b71..6fc5a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-01-04 Havoc Pennington <hp@pobox.com>
+ * src/display.c (event_callback): don't lower docks when a grab
+ causes them to get LeaveNotify
+
+2002-01-04 Havoc Pennington <hp@pobox.com>
+
* src/screen.c (meta_screen_free): set event mask on root window
to 0 so other window managers (such as ourselves restarting) can
start up; addresses race condition on restart where the old WM
diff --git a/src/display.c b/src/display.c
index 1c2a713..b98a0e8 100644
--- a/src/display.c
+++ b/src/display.c
@@ -873,7 +873,9 @@ event_callback (XEvent *event,
break;
}
- if (window->type == META_WINDOW_DOCK)
+ if (window->type == META_WINDOW_DOCK &&
+ event->xcrossing.mode != NotifyGrab &&
+ event->xcrossing.mode != NotifyUngrab)
meta_window_lower (window);
}
break;