Merge lp:~gerboland/qtubuntu/make-up-physical-size-if-mir-says-0x0 into lp:qtubuntu

[Gerry Boland]

Check if physical display size is zero and if so, guess something more suitable.

Remove unused "nativeGeometry" variable

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:335
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/104/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2533
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2561
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2442
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2442
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2442
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2435/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2435
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2435/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/104/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Looks ok; just one comment.

review: Needs Fixing

[Gerry Boland (gerboland)]

I'm not convinced this is useful, marking WiP

Unmerged revisions

335. By Gerry Boland on 2016-08-10

Check if physical display size is zero and if so, guess something more suitable.

Remove unused "nativeGeometry"

=== modified file 'src/ubuntumirclient/screen.cpp'
--- src/ubuntumirclient/screen.cpp	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/screen.cpp	2016-08-10 16:28:11 +0000
@@ -32,6 +32,7 @@
 
 #include <memory>
 
+namespace {
 static const int overrideDevicePixelRatio = qgetenv("QT_DEVICE_PIXEL_RATIO").toInt();
 
 static const char *orientationToStr(Qt::ScreenOrientation orientation) {
@@ -51,6 +52,24 @@
     }
 }
 
+QSizeF setPhysicalSize(QSize size_mm, QSize resolution)
+{
+    float width_mm = size_mm.width();
+    float height_mm = size_mm.height();
+
+    if (width_mm <= 0 || height_mm <= 0) {
+        // Mir cannot determine the physical dimentions of the display, either because it has
+        // no such measurement (i.e. projector) or is a virtual machine. In that case, guess
+        // something reasonable
+        const int dpi = 100;
+        width_mm = qRound(resolution.width() * 25.4 / dpi);
+        height_mm = qRound(resolution.height() * 25.4 / dpi);
+    }
+
+    return QSizeF(width_mm, height_mm);
+}
+} // namespace {
+
 const QEvent::Type OrientationChangeEvent::mType =
         static_cast<QEvent::Type>(QEvent::registerEventType());
 
@@ -143,10 +162,6 @@
 
 void UbuntuScreen::setMirOutput(const MirOutput *output)
 {
-    // Physical screen size (in mm)
-    mPhysicalSize.setWidth(mir_output_get_physical_width_mm(output));
-    mPhysicalSize.setHeight(mir_output_get_physical_height_mm(output));
-
     // Pixel Format
 //    mFormat = qImageFormatFromMirPixelFormat(mir_output_get_current_pixel_format(output)); // GERRY: TODO
 
@@ -155,13 +170,17 @@
 
     // Mode = Resolution & refresh rate
     const MirOutputMode *mode = mir_output_get_current_mode(output);
-    mNativeGeometry.setX(mir_output_get_position_x(output));
-    mNativeGeometry.setY(mir_output_get_position_y(output));
-    mNativeGeometry.setWidth(mir_output_mode_get_width(mode));
-    mNativeGeometry.setHeight(mir_output_mode_get_height(mode));
+    mGeometry.setX(mir_output_get_position_x(output));
+    mGeometry.setY(mir_output_get_position_y(output));
+    mGeometry.setWidth(mir_output_mode_get_width(mode));
+    mGeometry.setHeight(mir_output_mode_get_height(mode));
 
     mRefreshRate = mir_output_mode_get_refresh_rate(mode);
 
+    // Physical screen size (in mm)
+    QSize mirPhysicalSize(mir_output_get_physical_width_mm(output), mir_output_get_physical_height_mm(output));
+    mPhysicalSize = setPhysicalSize(mirPhysicalSize, mGeometry.size());
+
     // UI scale & DPR
     mScale = mir_output_get_scale_factor(output);
     if (overrideDevicePixelRatio > 0) {
@@ -174,11 +193,6 @@
 
     mOutputId = mir_output_get_id(output);
 
-    mGeometry.setX(mNativeGeometry.x());
-    mGeometry.setY(mNativeGeometry.y());
-    mGeometry.setWidth(mNativeGeometry.width());
-    mGeometry.setHeight(mNativeGeometry.height());
-
     // Set the default orientation based on the initial screen dimensions.
     mNativeOrientation = (mGeometry.width() >= mGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
 

=== modified file 'src/ubuntumirclient/screen.h'
--- src/ubuntumirclient/screen.h	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/screen.h	2016-08-10 16:28:11 +0000
@@ -62,7 +62,7 @@
 private:
     void setMirOutput(const MirOutput *output);
 
-    QRect mGeometry, mNativeGeometry;
+    QRect mGeometry;
     QSizeF mPhysicalSize;
     qreal mDevicePixelRatio;
     Qt::ScreenOrientation mNativeOrientation;