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

[Michał Sawicz]

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)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1305
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2312/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/135/console
    None: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/136/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1305
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2311/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/134/console
    None: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/135/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/ubuntu-ui-toolkit/dynamic-grid-unit]

1305. By Michał Sawicz on 2016-04-20

Don't try to connect to null native interface

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1305
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2313/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/137/console

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

> qDebug() << "GRID UNIT changed to " << m_gridUnit;

No unconditional debug spam, please.

What about unit test?

Note: This MR needs to be targeted at staging, not trunk!

review: Needs Fixing

[Tim Peeters (tpeeters)]

+ // HACK - if multimonitor situation, ignore any scale changes reported by the LVDS screen (unity8-specific policy)

So is this a bug that needs to be fixed? If yes, please link to the bug here.

review: Needs Information

[lp:~unity-team/ubuntu-ui-toolkit/dynamic-grid-unit]

1306. By Michał Sawicz on 2016-04-21

Drop debug, bump copyright

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2314/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/138/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/ubuntu-ui-toolkit/dynamic-grid-unit]

1307. By Michał Sawicz on 2016-04-21

Improve ucunits.cpp comment and reference the LP bug

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1307
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2316/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/140/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/ubuntu-ui-toolkit/dynamic-grid-unit]

1308. By Albert Astals Cid on 2016-04-22

Add a test for scale

1309. By Albert Astals Cid on 2016-04-22

2016

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1308
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2317/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/141/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1309
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2318/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/142/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/ubuntu-ui-toolkit/dynamic-grid-unit]

1310. By Gerry Boland on 2016-04-25

UCLabel: should compare pixel size changes with previous font pixel size, not the default

[Gerry Boland (gerboland)]

Marking WIP as we're using this branch in our silo

[lp:~unity-team/ubuntu-ui-toolkit/dynamic-grid-unit]

1311. By Gerry Boland on 2016-04-26

Combine slot calls on GU change

1312. By Gerry Boland on 2016-04-26

PageHeaderStyle: bind units.gu to the contentHeight, do not set by value

1313. By Gerry Boland on 2016-04-26

SheetForegroundStyle: bind units.gu to the bottom margin, do not set by value

1314. By Michał Sawicz on 2016-04-26

Split the connect

1315. By Michał Sawicz on 2016-04-26

Declare as slot

1316. By Gerry Boland on 2016-04-27

Merge trunk

1317. By Gerry Boland on 2016-04-27

OptionSelector - delegate heights set as binding not value

1318. By Michał Sawicz on 2016-04-27

Merge staging

1319. By Albert Astals Cid on 2016-04-29

Let 1.2 be broken as requested by reviewers

Maybe this way we get a quicker move to 1.3 :D

1320. By Albert Astals Cid on 2016-04-29

Add test proving why we need the uclabel patch

1321. By Albert Astals Cid on 2016-04-29

better name

[Michał Sawicz (saviq)]

This got merged into staging as two revisions, this MP just targets trunk with combined diff (to not cherry-pick and confuse staging).

https://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/staging/revision/1953
https://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/staging/revision/1966

review: Approve

=== modified file 'src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml'
--- src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2016-04-29 10:30:35 +0000
@@ -127,7 +127,7 @@
     }
 
     Component.onCompleted: {
-        height = listView.itemHeight = childrenRect.height;
+        height = listView.itemHeight = Qt.binding(function() { return childrenRect.height; });
     }
 
     //Since we don't want to add states to our divider, we use the exposed alias provided in Empty to access it and alter it's opacity from here.

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-04-27 13:58:24 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-04-29 10:30:35 +0000
@@ -63,19 +63,19 @@
             if (landscape) {
                 if (hasSubtitle) {
                     // with subtitle, and with or without extension
-                    titleAreaHeight = units.gu(4);
-                    titleBottomSpacing = units.gu(2);
+                    titleAreaHeight = Qt.binding(function() { return units.gu(4) });
+                    titleBottomSpacing = Qt.binding(function() { return units.gu(2) });
                 } else if (hasExtension) {
-                    titleAreaHeight = units.gu(4);
-                    titleBottomSpacing = units.gu(1);
+                    titleAreaHeight = Qt.binding(function() { return units.gu(4) });
+                    titleBottomSpacing = Qt.binding(function() { return units.gu(1) });
                 } else {
-                    titleAreaHeight = units.gu(5)
+                    titleAreaHeight = Qt.binding(function() { return units.gu(5) });
                     titleBottomSpacing = 0;
                 }
             } else { // portrait
-                titleAreaHeight = units.gu(6);
+                titleAreaHeight = Qt.binding(function() { return units.gu(6) });
                 if (hasSubtitle) {
-                    titleBottomSpacing = units.gu(1);
+                    titleBottomSpacing = Qt.binding(function() { return units.gu(1) });
                 } else {
                     titleBottomSpacing = 0;
                 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml	2015-04-25 07:36:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml	2016-04-29 10:30:35 +0000
@@ -81,7 +81,7 @@
             button.anchors.left = container.left;
             button.anchors.right = container.right;
             button.anchors.verticalCenter = container.verticalCenter;
-            button.anchors.margins = units.gu(1);
+            button.anchors.margins = Qt.binding(function() { return units.gu(1) });
         }
 
         Connections {

=== modified file 'src/Ubuntu/Components/plugin/label_p.h'
--- src/Ubuntu/Components/plugin/label_p.h	2016-03-11 19:28:41 +0000
+++ src/Ubuntu/Components/plugin/label_p.h	2016-04-29 10:30:35 +0000
@@ -47,7 +47,6 @@
     };
 
     UCLabel *q_ptr;
-    QFont defaultFont;
     UCLabel::ColorProviderFunc defaultColor;
     UCLabel::TextSize textSize;
     quint8 flags;

=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2016-04-29 10:30:35 +0000
@@ -130,16 +130,14 @@
     q->postThemeChanged();
 
     updatePixelSize();
-    defaultFont = q->font();
+    QFont defaultFont = q->font();
     defaultFont.setFamily("Ubuntu");
     defaultFont.setWeight(QFont::Light);
     q->setFont(defaultFont);
     updateRenderType();
 
     QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(updateRenderType()));
-    QObject::connect(UCUnits::instance(), &UCUnits::gridUnitChanged, q, [this](){
-                updatePixelSize();
-            }, Qt::DirectConnection);
+    QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(updatePixelSize()));
 
     QObject::connect(q, &UCLabel::enabledChanged, q, &UCLabel::postThemeChanged, Qt::DirectConnection);
 
@@ -202,7 +200,7 @@
     Q_D(UCLabel);
     // we must restrict ourself to the pixelSize change as any font property change will
     // lead to the setter call.
-    if (d->defaultFont.pixelSize() != font.pixelSize()) {
+    if (this->font().pixelSize() != font.pixelSize()) {
         d->flags |= UCLabelPrivate::PixelSizeSet;
     }
     QQuickText::setFont(font);

=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
--- src/Ubuntu/Components/plugin/uclabel.h	2016-04-20 15:00:27 +0000
+++ src/Ubuntu/Components/plugin/uclabel.h	2016-04-29 10:30:35 +0000
@@ -91,6 +91,7 @@
     Q_DECLARE_PRIVATE_D(d_ptr.data(), UCLabel)
     Q_DISABLE_COPY(UCLabel)
     Q_PRIVATE_SLOT(d_func(), void updateRenderType())
+    Q_PRIVATE_SLOT(d_func(), void updatePixelSize())
 };
 
 QML_DECLARE_TYPE(UCLabel)

=== modified file 'tests/unit/tst_components/tst_label13.qml'
--- tests/unit/tst_components/tst_label13.qml	2016-03-14 18:56:42 +0000
+++ tests/unit/tst_components/tst_label13.qml	2016-04-29 10:30:35 +0000
@@ -158,6 +158,20 @@
         verifyManualRenderType(textSetRenderType, Text.NativeRendering);
     }
 
+    function test_colorGUPixelSize() {
+        units.gridUnit = 8;
+        textTestColorGUPixelSize.font.bold = true;
+        var pixelSizeAt8GU = textTestColorGUPixelSize.font.pixelSize;
+
+        units.gridUnit = 16;
+        textTestColorGUPixelSize.font.bold = false;
+        verify(textTestColorGUPixelSize.font.pixelSize > pixelSizeAt8GU);
+
+        units.gridUnit = 8;
+        textTestColorGUPixelSize.font.bold = true;
+        compare(textTestColorGUPixelSize.font.pixelSize, pixelSizeAt8GU);
+    }
+
     Label {
         id: textCustom
     }
@@ -192,4 +206,8 @@
     Label {
         id: textSetRenderType
     }
+
+    Label {
+        id: textTestColorGUPixelSize
+    }
 }