Merge lp:~lukas-kde/unity8/highdpi-mousetouchadaptor into lp:unity8

[Lukáš Tinkl]

respect target window's devicePixelRatio in MouseTouchAdaptor

respect target window's devicePixelRatio in MouseTouchAdaptor

this fixes the mouse events for highdpi displays when using
QT_DEVICE_PIXEL_RATIO != 1

test with various QT_DEVICE_PIXEL_RATIO values (1,2,unset)

 * Are there any related MPs required for this MP to build/function as expected? Please list.

No

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * Did you make sure that your branch does not contain spurious tags?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

N/A

 * Did you have a look at the warnings when running tests? Can they be reduced?

Yes

[Michael Zanetti (mzanetti)]

looks good to me. Please put the checklist into the description ;)

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

> looks good to me. Please put the checklist into the description ;)

Fixed, thanks for pointing out :)

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes!

 * Did CI run pass? If not, please explain why.

CI not running for this user yet. Will try to fix that.

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1800
http://jenkins.qa.ubuntu.com/job/unity8-ci/5804/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/95
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21100

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5804/rebuild

review: Approve (continuous-integration)

=== modified file 'src/MouseTouchAdaptor.cpp'
--- src/MouseTouchAdaptor.cpp	2015-03-02 12:41:17 +0000
+++ src/MouseTouchAdaptor.cpp	2015-06-07 15:01:04 +0000
@@ -104,10 +104,10 @@
     if (button != Qt::LeftButton)
         return true;
 
-    QPoint windowPos(pressEvent->event_x, pressEvent->event_y);
-
     QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
 
+    QPoint windowPos(pressEvent->event_x / targetWindow->devicePixelRatio(), pressEvent->event_y / targetWindow->devicePixelRatio());
+
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
     touchEvent.press(0 /* touchId */, windowPos);
@@ -125,10 +125,10 @@
     if (button != Qt::LeftButton)
         return true;
 
-    QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);
-
     QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
 
+    QPoint windowPos(releaseEvent->event_x / targetWindow->devicePixelRatio(), releaseEvent->event_y / targetWindow->devicePixelRatio());
+
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
     touchEvent.release(0 /* touchId */, windowPos);
@@ -144,10 +144,10 @@
         return true;
     }
 
-    QPoint windowPos(event->event_x, event->event_y);
-
     QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
 
+    QPoint windowPos(event->event_x / targetWindow->devicePixelRatio(), event->event_y / targetWindow->devicePixelRatio());
+
     QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
                                                        false /* autoCommit */);
     touchEvent.move(0 /* touchId */, windowPos);