summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire350@gmail.com>2015-12-05 18:06:41 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-12-07 19:07:11 +0000
commit5c7ddf3959c9842b7d8bd5c09c17a5b8e12cf7e2 (patch)
tree8536e2a5da27b3cb7fac38a9f216fc60e367435e /src
parent7281f99762be18e5da23af07d6cc7e6b5f3b65e3 (diff)
Input: fix, event filters can't be registered with the same priority
Change-Id: I74609baa9f39bc741b67e27b0a9a74ad65fe5cca Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/input/backend/inputhandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp
index 19622862a..7a71b78f0 100644
--- a/src/input/backend/inputhandler.cpp
+++ b/src/input/backend/inputhandler.cpp
@@ -76,7 +76,7 @@ void InputHandler::registerEventFilters(QEventFilterService *service)
clearPendingMouseEvents();
service->registerEventFilter(m_keyboardEventFilter, 512);
- service->registerEventFilter(m_mouseEventFilter, 512);
+ service->registerEventFilter(m_mouseEventFilter, 513);
}
// Called by the keyboardEventFilter in the main thread
@@ -182,10 +182,10 @@ QVector<Qt3DCore::QAspectJobPtr> InputHandler::mouseJobs()
Q_FOREACH (const HMouseController cHandle, m_activeMouseControllers) {
MouseController *controller = m_mouseControllerManager->data(cHandle);
- controller->updateMouseEvents(events);
// Event dispacthing job
if (!events.isEmpty()) {
+ controller->updateMouseEvents(events);
Q_FOREACH (const QNodeId &input, controller->mouseInputs()) {
MouseEventDispatcherJob *job = new MouseEventDispatcherJob(input, events);
job->setInputHandler(this);