summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stanley <jpsinthemix@verizon.net>2012-01-18 01:04:55 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-10 15:11:54 (GMT)
commit69ada23a75bb51b4efc90c6128cce22d5ee6a779 (patch)
tree30a625a16a824d3144d3ed8e737274858e508e1e
parent1095252559a937efcaaf012d8dfbb4e13c4fd6b5 (diff)
downloadQt-69ada23a75bb51b4efc90c6128cce22d5ee6a779.zip
Qt-69ada23a75bb51b4efc90c6128cce22d5ee6a779.tar.gz
Qt-69ada23a75bb51b4efc90c6128cce22d5ee6a779.tar.bz2
When doing mouse move compression, pass non-MotionNotify events to installed event dispatcher event filters
Change-Id: Ia71f23458b9a6bc728f3e05592f530e317ae453c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
-rw-r--r--src/gui/kernel/qapplication_x11.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 256db7d..4d642a9 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -4234,7 +4234,10 @@ bool QETWidget::translateMouseEvent(const XEvent *event)
&& (nextEvent.xclient.message_type == ATOM(_QT_SCROLL_DONE) ||
(nextEvent.xclient.message_type == ATOM(WM_PROTOCOLS) &&
(Atom)nextEvent.xclient.data.l[0] == ATOM(_NET_WM_SYNC_REQUEST))))) {
- qApp->x11ProcessEvent(&nextEvent);
+ // Pass the event through the event dispatcher filter so that applications
+ // which install an event filter on the dispatcher get to handle it first.
+ if (!QAbstractEventDispatcher::instance()->filterEvent(&nextEvent))
+ qApp->x11ProcessEvent(&nextEvent);
continue;
} else if (nextEvent.type != MotionNotify ||
nextEvent.xmotion.window != event->xmotion.window ||