Merge lp:~gerboland/ubuntu-ui-toolkit/dynamic-grid-unit into lp:ubuntu-ui-toolkit

[Gerry Boland]

Enable dynamic changing of grid units instigated by the shell

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1294
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2308/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/132/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2308/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	2015-12-07 12:09:45 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2016-02-03 16:00:05 +0000
@@ -101,6 +101,7 @@
 
     connect(this, &UCLabel::fontChanged, this, &UCLabel::_q_updateFontFlag, Qt::DirectConnection);
     connect(this, &UCLabel::colorChanged, this, &UCLabel::_q_customColor, Qt::DirectConnection);
+    connect(&UCUnits::instance(), &UCUnits::gridUnitChanged, this, &UCLabel::updatePixelSize, Qt::DirectConnection);
 }
 
 void UCLabel::postThemeChanged()
 
=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
--- src/Ubuntu/Components/plugin/uclabel.h	2015-10-20 10:19:10 +0000
+++ src/Ubuntu/Components/plugin/uclabel.h	2016-02-03 16:00:05 +0000
@@ -73,7 +73,7 @@
     void fontSizeChanged();
 
 private:
-    void updatePixelSize();
+    Q_SLOT void updatePixelSize();
     Q_SLOT void _q_updateFontFlag(const QFont &font);
     Q_SLOT void _q_customColor();
 
 
=== 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	2016-02-03 16:00:05 +0000
@@ -27,6 +27,12 @@
 #include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>
 
+#include <QtGui/qpa/qplatformnativeinterface.h>
+#include <QtGui/qpa/qplatformwindow.h>
+#include <QtGui/qpa/qplatformscreen.h>
+
+#include <QDebug>
+
 #define ENV_GRID_UNIT_PX "GRID_UNIT_PX"
 #define DEFAULT_GRID_UNIT_PX 8
 
@@ -104,6 +110,10 @@
     } else {
         m_gridUnit = DEFAULT_GRID_UNIT_PX * m_devicePixelRatio;
     }
+
+    auto nativeInterface = qGuiApp->platformNativeInterface();
+    QObject::connect(nativeInterface, &QPlatformNativeInterface::windowPropertyChanged,
+                     this, &UCUnits::windowPropertyChanged);
 }
 
 /*!
@@ -118,8 +128,12 @@
 
 void UCUnits::setGridUnit(float gridUnit)
 {
+    if (qFuzzyCompare(gridUnit, m_gridUnit)) {
+        return;
+    }
     m_gridUnit = gridUnit;
     Q_EMIT gridUnitChanged();
+    qDebug() << "GRID UNIT changed to " << m_gridUnit;
 }
 
 /*!
@@ -239,3 +253,33 @@
         return 0;
     }
 }
+
+void UCUnits::windowPropertyChanged(QPlatformWindow *window, const QString &propertyName)
+{
+    if (propertyName != QStringLiteral("scale")) { //don't care otherwise
+        return;
+    }
+
+    // I've no idea what my window is, but any messages I get should only be about my window!
+
+    // HACK - if multimonitor situation, ignore any scale changes reported by the LVDS screen (unity8-specific policy)
+    if (qGuiApp->allWindows().count() > 1) {
+        if (window && window->screen()
+                && window->screen()->name().contains("LVDS")) {
+            return;
+        }
+    }
+
+    auto nativeInterface = qGuiApp->platformNativeInterface();
+    QVariant scaleVal = nativeInterface->windowProperty(window, "scale");
+    if (!scaleVal.isValid()) {
+        return;
+    }
+    bool ok;
+    float scale = scaleVal.toFloat(&ok);
+    if (!ok || scale <= 0) {
+        return;
+    }
+    // choose integral grid unit value closest to requested scale
+    setGridUnit(qCeil(scale * DEFAULT_GRID_UNIT_PX) * m_devicePixelRatio);
+}
 
=== 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	2016-02-03 16:00:05 +0000
@@ -21,8 +21,10 @@
 
 #include <QObject>
 #include <QtCore/QHash>
+#include <QtCore/QString>
 #include <QtCore/QUrl>
 
+class QPlatformWindow;
 class UCUnits : public QObject
 {
     Q_OBJECT
@@ -52,6 +54,9 @@
     QString suffixForGridUnit(float gridUnit);
     float gridUnitSuffixFromFileName(const QString &fileName);
 
+private Q_SLOTS:
+    void windowPropertyChanged(QPlatformWindow *window, const QString &propertyName);
+
 private:
     float m_devicePixelRatio;
     float m_gridUnit;