Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/validDpi into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Only set ppmm in SwipeArea if screen has valid dpi

[Timo Jyrinki (timo-jyrinki)]

Fixes the issue!

Test project /home/ubuntu/d/build-area/address-book-app-0.2+16.04.20151210/obj-x86_64-linux-gnu
    Start 1: contact_list
1/9 Test #1: contact_list ..................... Passed 1.28 sec
    Start 2: Contact_list_model

review: Approve

[Gerry Boland (gerboland)]

I'd argue this is a workaround for a qtubuntu/mir bug, which needs fixing. Please add a FIXME with a link to the bug report #1525293

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1756
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2617/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1348
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1344

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2617/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/1409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/716
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/716/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/720

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1757
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2618/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1349
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1349/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1345

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2618/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp'
--- src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp	2015-12-09 19:12:19 +0000
+++ src/Ubuntu/Components/plugin/gestures/ucswipearea.cpp	2015-12-11 15:43:37 +0000
@@ -790,7 +790,9 @@
 
             // FIXME: Handle window->screen() changes (ie window changing screens)
             qreal pixelsPerMm = value.window->screen()->physicalDotsPerInch() / 25.4;
-            d->setPixelsPerMm(pixelsPerMm);
+            // FIXME: dpi can be negative lp#1525293
+            if (pixelsPerMm > 0)
+                d->setPixelsPerMm(pixelsPerMm);
         }
     }
 }