Merge lp:~fboucault/unity-mir/dpr_rebase_qt_5.1 into lp:unity-mir

[Florian Boucault]

Rebase resolution independence on Qt's infrastructure:
- QPlatformScreen::devicePixelRatio
- QPlatformWindow::devicePixelRatio

Change is only enabled for Qt version >= 5.1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/142

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/279/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/unity-mir/dpr_rebase_qt_5.1]

186. By Florian Boucault on 2014-03-06

Take into account that there might not be a window.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/144
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/280/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/unity-mir/dpr_rebase_qt_5.1]

187. By Florian Boucault on 2014-03-06

Round width and height so that the actual dimensions are computed from the virtual ones without missing any pixel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/145
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/145/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/144

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/281/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

This change should be landed for now as the DPR patches in QtUbuntu and the UI Toolkit are only enabled for the webbrowser and the webapps (not for Unity).

review: Disapprove

Unmerged revisions

187. By Florian Boucault on 2014-03-06

Round width and height so that the actual dimensions are computed from the virtual ones without missing any pixel.

186. By Florian Boucault on 2014-03-06

Take into account that there might not be a window.

185. By Florian Boucault on 2014-03-06

Rebase resolution independence on Qt's infrastructure:
- QPlatformScreen::devicePixelRatio
- QPlatformWindow::devicePixelRatio

Change is only enabled for Qt version >= 5.1

=== modified file 'src/modules/Unity/Application/inputarea.cpp'
--- src/modules/Unity/Application/inputarea.cpp	2013-11-26 08:56:08 +0000
+++ src/modules/Unity/Application/inputarea.cpp	2014-03-06 22:02:00 +0000
@@ -16,6 +16,8 @@
 
 //Qt
 #include <QCoreApplication>
+#include <QtCore/qmath.h>
+#include <QQuickWindow>
 
 // mir
 #include <mircommon/mir/geometry/rectangle.h>
@@ -138,6 +140,15 @@
     setMirInputArea(m_geometry);
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
+void InputArea::onWindowChanged()
+{
+    DLOG("InputArea::onWindowChanged (this=%p)", this);
+
+    setMirInputArea(m_geometry);
+}
+#endif
+
 void InputArea::listenToAscendantsChanges()
 {
     DLOG("InputArea::listenToAscendantsChanges (this=%p)", this);
@@ -157,6 +168,9 @@
         m_connections.append(connect(parent, &QQuickItem::yChanged, this, &InputArea::onAscendantGeometryChanged));
         m_connections.append(connect(parent, &QQuickItem::widthChanged, this, &InputArea::onAscendantGeometryChanged));
         m_connections.append(connect(parent, &QQuickItem::heightChanged, this, &InputArea::onAscendantGeometryChanged));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
+        m_connections.append(connect(this, &QQuickItem::windowChanged, this, &InputArea::onWindowChanged));
+#endif
         parent = parent->parentItem();
     }
 }
@@ -178,12 +192,15 @@
     using namespace mir::geometry;
     const QRect rect = parentItem()->mapRectToScene(relativeGeometry).toRect();
 
-    m_mirInputArea.top_left.x = X{rect.x()};
-    m_mirInputArea.top_left.y = Y{rect.y()};
-    m_mirInputArea.size.width = Width{rect.width()};
-    m_mirInputArea.size.height = Height{rect.height()};
+    const float kPixelRatio = (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)) && window() != NULL ? static_cast<float>(window()->devicePixelRatio()) : 1.0f;
+
+    m_mirInputArea.top_left.x = X{rect.x() * kPixelRatio};
+    m_mirInputArea.top_left.y = Y{rect.y() * kPixelRatio};
+    m_mirInputArea.size.width = Width{qCeil(rect.width() * kPixelRatio)};
+    m_mirInputArea.size.height = Height{qCeil(rect.height() * kPixelRatio)};
 
     if (m_surface) {
+        m_surface->removeInputArea(this);
         m_surface->installInputArea(this);
     }
 }

=== modified file 'src/modules/Unity/Application/inputarea.h'
--- src/modules/Unity/Application/inputarea.h	2013-11-26 08:56:08 +0000
+++ src/modules/Unity/Application/inputarea.h	2014-03-06 22:02:00 +0000
@@ -54,6 +54,9 @@
 private Q_SLOTS:
     void onAscendantChanged();
     void onAscendantGeometryChanged();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
+    void onWindowChanged();
+#endif
     void setNullSurface();
 
 private: