Merge lp:~zsombi/ubuntu-ui-toolkit/screenDprChange into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Temporary solution: react on screen changes when external display is connected.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1620
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/908
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/908/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/905

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Is this a solution for bug 1510968?

What about test cases? If not automatic, is there a manual test?

review: Needs Information

[Zsombor Egri (zsombi)]

> Is this a solution for bug 1510968?
>
> What about test cases? If not automatic, is there a manual test?

This was used in the Convergence sprint in London (around September) and we agreed t is not a good practice. I forgot to delete it...

Unmerged revisions

1620. By Zsombor Egri on 2015-08-26

debug include removed

1619. By Zsombor Egri on 2015-08-26

react on screen change when external display is connected

=== modified file 'src/Ubuntu/Components/plugin/ucunits.cpp'
--- src/Ubuntu/Components/plugin/ucunits.cpp	2015-07-10 14:58:54 +0000
+++ src/Ubuntu/Components/plugin/ucunits.cpp	2015-08-26 09:46:49 +0000
@@ -103,9 +103,18 @@
         m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
     } else {
         m_gridUnit = DEFAULT_GRID_UNIT_PX * m_devicePixelRatio;
+        connect(qGuiApp, &QGuiApplication::screenAdded, this, &UCUnits::updateDprOnScreenChange);
     }
 }
 
+void UCUnits::updateDprOnScreenChange(QScreen *screen)
+{
+    Q_UNUSED(screen);
+    m_devicePixelRatio = qGuiApp->devicePixelRatio();
+    m_gridUnit = DEFAULT_GRID_UNIT_PX * m_devicePixelRatio;
+    Q_EMIT gridUnitChanged();
+}
+
 /*!
     \qmlproperty real Units::gridUnit
 

=== modified file 'src/Ubuntu/Components/plugin/ucunits.h'
--- src/Ubuntu/Components/plugin/ucunits.h	2015-05-22 18:51:25 +0000
+++ src/Ubuntu/Components/plugin/ucunits.h	2015-08-26 09:46:49 +0000
@@ -23,6 +23,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QUrl>
 
+class QScreen;
 class UCUnits : public QObject
 {
     Q_OBJECT
@@ -51,6 +52,7 @@
 protected:
     QString suffixForGridUnit(float gridUnit);
     float gridUnitSuffixFromFileName(const QString &fileName);
+    Q_SLOT void updateDprOnScreenChange(QScreen *screen);
 
 private:
     float m_devicePixelRatio;