Merge lp:~gerboland/qtmir/multimonitorAPfix into lp:qtmir

[Gerry Boland]

Workaround for AutoPilot input coordinate positioning being outside screen geometry

[Lukáš Tinkl (lukas-kde)]

Text conflict in src/platforms/mirserver/screenwindow.cpp
Text conflict in src/platforms/mirserver/screenwindow.h
Text conflict in tests/mirserver/Screen/screen_test.cpp

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

Also, wouldn't QGuiApplication::topLevelAt() do basically the same thing as the whole method, preventing the bug?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:390
http://jenkins.qa.ubuntu.com/job/qtmir-ci/529/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/262/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/262/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/107/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Suspect LP confused, it merges cleanly for me

[Daniel d'Andrada (dandrader)]

Ok

review: Approve

=== modified file 'src/platforms/mirserver/screencontroller.cpp'
--- src/platforms/mirserver/screencontroller.cpp	2015-10-21 11:36:07 +0000
+++ src/platforms/mirserver/screencontroller.cpp	2015-10-21 11:36:07 +0000
@@ -202,6 +202,12 @@
 
 QWindow* ScreenController::getWindowForPoint(const QPoint &point) //FIXME - not thread safe & not efficient
 {
+    // This is a part optimization, and a part work-around for AP generated input events occasionally
+    // appearing outside the screen borders: https://bugs.launchpad.net/qtmir/+bug/1508415
+    if (m_screenList.length() == 1 && m_screenList.first()->window()) {
+        return m_screenList.first()->window()->window();
+    }
+
     for (Screen *screen : m_screenList) {
         if (screen->window() && screen->geometry().contains(point)) {
             return screen->window()->window();