Merge lp:~tpeeters/ubuntu-ui-toolkit/fasterWindowColorTrunk into lp:ubuntu-ui-toolkit

[Tim Peeters]

Set the window color as soon as the window is available, to avoid a flickering background when it is updated later, plus fix runtest.sh to work for xenial on arm.

Applied staging r1895 and r1913 to trunk.

[lp:~tpeeters/ubuntu-ui-toolkit/fasterWindowColorTrunk]

1288. By Tim Peeters on 2016-03-30

cherry pick r1913 from staging

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2016-02-02 13:43:32 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2016-03-30 18:56:07 +0000
@@ -47,30 +47,16 @@
     */
     property color footerColor: styledItem.footerColor
 
-    Gradient {
-        id: backgroundGradient
-        GradientStop { position: 0.0; color: mainViewStyle.headerColor }
-        GradientStop { position: 0.83; color: mainViewStyle.backgroundColor }
-        GradientStop { position: 1.0; color: mainViewStyle.footerColor }
-    }
-
     Rectangle {
-        id: backgroundColor
         anchors.fill: parent
-        color: mainViewStyle.backgroundColor
-        gradient: internals.isGradient ? backgroundGradient : null
-        visible: internals.isGradient
-    }
-
-    Binding {
-        target: typeof window != 'undefined' ? window : null
-        property: "color"
-        value: mainViewStyle.backgroundColor
-    }
-
-    QtObject {
-        id: internals
-        property bool isGradient: mainViewStyle.backgroundColor != mainViewStyle.headerColor ||
-                                  mainViewStyle.backgroundColor != mainViewStyle.footerColor
+        // Hide the gradient if the style was loaded and afterwards the header
+        //  and footer color are set to the same value as backgroundColor.
+        visible: mainViewStyle.backgroundColor != mainViewStyle.headerColor ||
+                 mainViewStyle.backgroundColor != mainViewStyle.footerColor
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: mainViewStyle.headerColor }
+            GradientStop { position: 0.83; color: mainViewStyle.backgroundColor }
+            GradientStop { position: 1.0; color: mainViewStyle.footerColor }
+        }
     }
 }

=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.cpp'
--- src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-02-15 14:15:37 +0000
+++ src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-03-30 18:56:07 +0000
@@ -59,6 +59,8 @@
         // FIXME Wire this up to the application lifecycle management API instead of quit().
         qApp->quit();
     });
+
+    QObject::connect(q, SIGNAL(windowChanged(QQuickWindow*)), q, SLOT(_q_updateWindow()));
 }
 
 void UCMainViewBasePrivate::_q_headerColorBinding(const QColor &col)
@@ -107,6 +109,14 @@
     d_func()->init();
 }
 
+void UCMainViewBasePrivate::_q_updateWindow()
+{
+    Q_Q(UCMainViewBase);
+    if (q->window()) {
+        q->window()->setColor(m_backgroundColor);
+    }
+}
+
 UCMainViewBase::UCMainViewBase(UCMainViewBasePrivate &dd, QQuickItem *parent)
     : UCPageTreeNode( dd, parent)
 {
@@ -177,6 +187,11 @@
 {
     Q_D(UCMainViewBase);
 
+    // MainViewStyle is used to draw the gradient background.
+    if (d->styleName().isEmpty()) {
+        d->setStyleName(QStringLiteral("MainViewStyle"));
+    }
+
     //disable binding to background color
     d->m_flags |= UCMainViewBasePrivate::CustomHeaderColor;
     d->_q_headerColorBinding(headerColor);
@@ -220,6 +235,8 @@
     if (!(d->m_flags & UCMainViewBasePrivate::CustomFooterColor))
         d->_q_footerColorBinding(d->m_backgroundColor);
 
+    d->_q_updateWindow();
+
     // FIXME: Define the background colors in MainViewStyle and get rid of the properties
     //  in MainViewBase. That removes the need for auto-theming.
     d->doAutoTheme();
@@ -235,6 +252,10 @@
 {
     Q_D(UCMainViewBase);
 
+    // MainViewStyle is used to draw the gradient background.
+    if (d->styleName().isEmpty()) {
+        d->setStyleName(QStringLiteral("MainViewStyle"));
+    }
     //disable binding to background color
     d->m_flags |= UCMainViewBasePrivate::CustomFooterColor;
     d->_q_footerColorBinding(footerColor);
@@ -286,7 +307,6 @@
 {
     Q_D(UCMainViewBase);
     UCPageTreeNode::componentComplete();
-    d->setStyleName(QStringLiteral("MainViewStyle"));
     d->doAutoTheme();
 
     if (d->m_actionContext)
@@ -312,3 +332,5 @@
         d->m_actionContext->classBegin();
     }
 }
+
+#include "moc_ucmainviewbase.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.h'
--- src/Ubuntu/Components/plugin/ucmainviewbase.h	2016-01-25 08:40:25 +0000
+++ src/Ubuntu/Components/plugin/ucmainviewbase.h	2016-03-30 18:56:07 +0000
@@ -79,6 +79,7 @@
 
 private:
     Q_DECLARE_PRIVATE(UCMainViewBase)
+    Q_PRIVATE_SLOT(d_func(), void _q_updateWindow())
 };
 
 #endif // UCMAINVIEWBASE_H

=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase_p.h'
--- src/Ubuntu/Components/plugin/ucmainviewbase_p.h	2016-01-21 12:30:25 +0000
+++ src/Ubuntu/Components/plugin/ucmainviewbase_p.h	2016-03-30 18:56:07 +0000
@@ -40,7 +40,8 @@
 
     void _q_headerColorBinding (const QColor &col);
     void _q_footerColorBinding (const QColor &col);
-    void doAutoTheme ();
+    void doAutoTheme();
+    void _q_updateWindow();
 
     QString m_applicationName;
     QColor m_headerColor;

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2016-02-16 12:27:45 +0000
+++ tests/unit/runtest.sh	2016-03-30 18:56:07 +0000
@@ -43,8 +43,13 @@
   fi
   _CMD="-n $_TESTFILE -m 300"
 
-  _CMD="dbus-test-runner --task gdb -p --quiet $_CMD"
-  _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $EXE"
+  DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
+  if [[ ${DEB_HOST_ARCH} =~ 'arm' ]]; then
+    _CMD="dbus-test-runner --task $EXE $_CMD"
+  else
+    _CMD="dbus-test-runner --task gdb -p --quiet $_CMD"
+    _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $EXE"
+  fi
 
   if [ "$_MINIMAL" = "minimal" ]; then
       _CMD="$_CMD -p -platform -p minimal"