Merge lp:~unity-team/unity8/rtm-20150108 into lp:unity8/rtm-14.09

[Michał Sawicz]

[lp:~unity-team/unity8/rtm-20150108]

1414. By Albert Astals Cid on 2015-01-08

Rework how we set the ranges so we get some more asynchronousity from item views
Approved by: Andrea Cimitan

1415. By Michał Sawicz on 2015-01-08

Don't block handling power events on loading the greeter's qml and the background image.

During power button press, we call greeter.showNow(), which was taking so long to return that we couldn't handle the power button release for a few seconds. Which meant that the shutdown dialog thought it would be a good time to appear.

The easiest fix is to delay calling showNow until after we finish handling the event.
Approved by: Daniel d'Andrada, PS Jenkins bot

1416. By Michał Sawicz on 2015-01-08

Add changelog

[Michał Sawicz (saviq)]

As per the upstream changes.

review: Approve

[lp:~unity-team/unity8/rtm-20150108]

1417. By Albert Astals Cid on 2015-01-13

Make sure changing a scope doesn't trigger creation/destruction of delegates until it's finished

1418. By Michał Sawicz on 2015-01-13

Update changelog

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-07 09:49:10 +0000
+++ debian/changelog	2015-01-13 15:16:16 +0000
@@ -1,3 +1,21 @@
+unity8 (8.02+15.04.20150108~rtm--0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Albert Astals ]
+  * Use QImageReader not to load the image into memory twice
+  * Don't create the whole current scope delegates, just height * 3 (LP:
+    #1384393)
+  * Make CroppedImageSizer async
+  * Rework how we set the ranges so we get some more asynchronousity
+    from item views
+  * Make sure changing a scope doesn't trigger creation/destruction of
+    delegates until it's finished
+
+  [ Michael Terry ]
+  * Don't block handling power events on loading the greeter's qml and the
+    background image. (LP: #1383277)
+
+ -- Michał Sawicz <[e-mail]>  Thu, 08 Jan 2015 14:02:47 +0100
+
 unity8 (8.02+15.04.20150107~rtm-0ubuntu1) 14.09; urgency=low
 
   [ Michael Zanetti ]
 
=== modified file 'debian/control'
--- debian/control	2014-12-12 13:08:13 +0000
+++ debian/control	2015-01-13 15:16:16 +0000
@@ -174,7 +174,6 @@
          libhardware2,
          unity-schemas (>= 7.3.1+14.10.20140915),
          pay-service,
-         qml-module-ubuntu-connectivity,
          ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-launcher-impl,
 
=== modified file 'plugins/Dash/CMakeLists.txt'
--- plugins/Dash/CMakeLists.txt	2014-05-14 10:11:14 +0000
+++ plugins/Dash/CMakeLists.txt	2015-01-13 15:16:16 +0000
@@ -11,7 +11,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Quick_INCLUDE_DIRS}
     ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
     ${Qt5V8_PRIVATE_INCLUDE_DIR}
 )
@@ -25,6 +24,8 @@
     verticaljournal.cpp
     horizontaljournal.cpp
     organicgrid.cpp
+    croppedimagesizer.cpp
+    croppedimagesizerasyncworker.cpp
     )
 
 add_library(Dash-qml MODULE
@@ -36,6 +37,6 @@
     ${Qt5Quick_LIBRARIES}
     )
 
-qt5_use_modules(Dash-qml Qml Quick)
+qt5_use_modules(Dash-qml Qml Quick Concurrent)
 
 add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
 
=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-10-20 20:51:10 +0000
+++ plugins/Dash/CardCreator.js	2015-01-13 15:16:16 +0000
@@ -82,16 +82,16 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
                                         } \n\
                                     } \n\
-                                    image: CroppedImageMinimumSourceSize { \n\
+                                    CroppedImageMinimumSourceSize { \n\
+                                        id: artImage; \n\
                                         objectName: "artImage"; \n\
-                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
-                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
-                                        cache: true; \n\
+                                        source: cardData && cardData["art"] || ""; \n\
                                         asynchronous: root.asynchronous; \n\
                                         visible: false; \n\
                                         width: %2; \n\
                                         height: %3; \n\
                                     } \n\
+                                    image: artImage.image; \n\
                                 } \n\
                             } \n\
                         }\n';
@@ -181,11 +181,11 @@
                                 id: mascotShapeLoader; \n\
                                 objectName: "mascotShapeLoader"; \n\
                                 asynchronous: root.asynchronous; \n\
-                                active: mascotImage.status === Image.Ready; \n\
+                                active: mascotImage.image.status === Image.Ready; \n\
                                 visible: showHeader && active && status == Loader.Ready; \n\
                                 width: units.gu(6); \n\
                                 height: units.gu(5.625); \n\
-                                sourceComponent: UbuntuShape { image: mascotImage } \n\
+                                sourceComponent: UbuntuShape { image: mascotImage.image } \n\
                                 anchors { %1 } \n\
                             }\n';
 
@@ -195,8 +195,7 @@
                             id: mascotImage; \n\
                             objectName: "mascotImage"; \n\
                             anchors { %1 } \n\
-                            property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
-                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
+                            source: cardData && cardData["mascot"] || ""; \n\
                             width: units.gu(6); \n\
                             height: units.gu(5.625); \n\
                             horizontalAlignment: Image.AlignHCenter; \n\
@@ -435,7 +434,7 @@
             mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
         }
 
-        var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';
+        var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
         mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
     }
 
@@ -655,7 +654,6 @@
     var imports = 'import QtQuick 2.2; \n\
                    import Ubuntu.Components 1.1; \n\
                    import Ubuntu.Settings.Components 0.1; \n\
-                   import Ubuntu.Connectivity 1.0; \n\
                    import Dash 0.1;\n\
                    import Utils 0.1;\n';
     var card = cardString(template, components);
 
=== modified file 'plugins/Dash/CroppedImageMinimumSourceSize.qml'
--- plugins/Dash/CroppedImageMinimumSourceSize.qml	2014-09-17 10:16:11 +0000
+++ plugins/Dash/CroppedImageMinimumSourceSize.qml	2015-01-13 15:16:16 +0000
@@ -15,24 +15,30 @@
  */
 
 import QtQuick 2.3
-
-Image {
-    property bool resized: false
-    property bool resizing: false
-    fillMode: Image.PreserveAspectCrop
-    visible: resized
-    onSourceSizeChanged: {
-        if (!resized && !resizing) {
-            resizing = true;
-            var ar = width / height;
-            var ssar = sourceSize.width / sourceSize.height;
-            if (ar > ssar) {
-                sourceSize = Qt.size(width, 0);
-            } else {
-                sourceSize = Qt.size(0, height);
-            }
-            resizing = false;
-            resized = true;
-        }
+import Dash 0.1
+
+Item {
+    id: root
+
+    property string source
+    property alias image: innerImage
+    property alias asynchronous: innerImage.asynchronous
+    property alias verticalAlignment: innerImage.verticalAlignment
+    property alias horizontalAlignment: innerImage.horizontalAlignment
+    property alias fillMode: innerImage.fillMode
+
+    CroppedImageSizer {
+        id: sizer
+        source: root.source
+        width: root.width
+        height: root.height
+    }
+
+    Image {
+        id: innerImage
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectCrop
+        sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize
+        source: sizer.sourceSize.width == -1 && sizer.sourceSize.height == -1 ? "" : root.source
     }
 }
 
=== modified file 'plugins/Dash/abstractdashview.cpp'
--- plugins/Dash/abstractdashview.cpp	2014-05-22 13:37:05 +0000
+++ plugins/Dash/abstractdashview.cpp	2015-01-13 15:16:16 +0000
@@ -16,13 +16,12 @@
 
 #include "abstractdashview.h"
 
-static const qreal bufferRatio = 0.5;
-
 AbstractDashView::AbstractDashView()
  : m_delegateModel(nullptr)
  , m_asyncRequestedIndex(-1)
  , m_columnSpacing(0)
  , m_rowSpacing(0)
+ , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
  , m_displayMarginBeginning(0)
  , m_displayMarginEnd(0)
  , m_needsRelayout(false)
@@ -112,6 +111,27 @@
     }
 }
 
+int AbstractDashView::cacheBuffer() const
+{
+    return m_buffer;
+}
+
+void AbstractDashView::setCacheBuffer(int buffer)
+{
+    if (buffer < 0) {
+        qmlInfo(this) << "Cannot set a negative cache buffer";
+        return;
+    }
+
+    if (m_buffer != buffer) {
+        m_buffer = buffer;
+        if (isComponentComplete()) {
+            polish();
+        }
+        emit cacheBufferChanged();
+    }
+}
+
 qreal AbstractDashView::displayMarginBeginning() const
 {
     return m_displayMarginBeginning;
@@ -160,9 +180,8 @@
 
     const qreal from = -m_displayMarginBeginning;
     const qreal to = height() + m_displayMarginEnd;
-    const qreal buffer = (to - from) * bufferRatio;
-    const qreal bufferFrom = from - buffer;
-    const qreal bufferTo = to + buffer;
+    const qreal bufferFrom = from - m_buffer;
+    const qreal bufferTo = to + m_buffer;
 
     bool added = addVisibleItems(from, to, false);
     bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
 
=== modified file 'plugins/Dash/abstractdashview.h'
--- plugins/Dash/abstractdashview.h	2014-05-15 14:50:23 +0000
+++ plugins/Dash/abstractdashview.h	2015-01-13 15:16:16 +0000
@@ -35,6 +35,7 @@
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
     Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
+    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
     Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning
                                             WRITE setDisplayMarginBeginning
                                             NOTIFY displayMarginBeginningChanged)
@@ -61,6 +62,9 @@
     qreal rowSpacing() const;
     void setRowSpacing(qreal rowSpacing);
 
+    int cacheBuffer() const;
+    void setCacheBuffer(int);
+
     qreal displayMarginBeginning() const;
     void setDisplayMarginBeginning(qreal);
 
@@ -72,6 +76,7 @@
     void delegateChanged();
     void columnSpacingChanged();
     void rowSpacingChanged();
+    void cacheBufferChanged();
     void displayMarginBeginningChanged();
     void displayMarginEndChanged();
 
@@ -113,6 +118,7 @@
 
     int m_columnSpacing;
     int m_rowSpacing;
+    int m_buffer;
     qreal m_displayMarginBeginning;
     qreal m_displayMarginEnd;
     bool m_needsRelayout;
 
=== added file 'plugins/Dash/croppedimagesizer.cpp'
--- plugins/Dash/croppedimagesizer.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Dash/croppedimagesizer.cpp	2015-01-13 15:16:16 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "croppedimagesizer.h"
+
+#include "croppedimagesizerasyncworker.h"
+
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QQmlEngine>
+#include <QQuickItem>
+
+CroppedImageSizer::CroppedImageSizer()
+ : m_width(0),
+   m_height(0),
+   m_sourceSize(QSize(-1, -1)),
+   m_worker(nullptr)
+{
+    connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
+    connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);
+}
+
+CroppedImageSizer::~CroppedImageSizer()
+{
+    if (m_worker) {
+        m_worker->abort();
+    }
+}
+
+QUrl CroppedImageSizer::source() const
+{
+    return m_source;
+}
+
+void CroppedImageSizer::setSource(const QUrl &source)
+{
+    if (source != m_source) {
+        m_source = source;
+        Q_EMIT sourceChanged();
+    }
+}
+
+qreal CroppedImageSizer::width() const
+{
+    return m_width;
+}
+
+void CroppedImageSizer::setWidth(qreal width)
+{
+    if (width != m_width) {
+        m_width = width;
+        Q_EMIT inputParamsChanged();
+    }
+}
+
+qreal CroppedImageSizer::height() const
+{
+    return m_height;
+}
+
+void CroppedImageSizer::setHeight(qreal height)
+{
+    if (height != m_height) {
+        m_height = height;
+        Q_EMIT inputParamsChanged();
+    }
+}
+
+QSize CroppedImageSizer::sourceSize() const
+{
+    return m_sourceSize;
+}
+
+void CroppedImageSizer::setSourceSize(const QSize &sourceSize)
+{
+    if (sourceSize != m_sourceSize) {
+        m_sourceSize = sourceSize;
+        Q_EMIT sourceSizeChanged();
+    }
+}
+
+void CroppedImageSizer::setImageSize(const QSize &imageSize)
+{
+    m_imageSize = imageSize;
+    m_worker = nullptr;
+    calculateSourceSize();
+}
+
+void CroppedImageSizer::requestImage()
+{
+    if (m_worker) {
+        m_worker->abort();
+        m_worker = nullptr;
+    }
+
+    if (m_source.isValid() && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {
+        QNetworkRequest request(m_source);
+        QNetworkReply *reply = qmlEngine(this)->networkAccessManager()->get(request);
+        m_worker = new CroppedImageSizerAsyncWorker(this, reply);
+    } else  {
+        setSourceSize(QSize(-1, -1));
+    }
+}
+
+void CroppedImageSizer::calculateSourceSize()
+{
+    if (m_source.isValid() && m_width > 0 && m_height > 0 && !m_worker) {
+        if (!m_imageSize.isEmpty()) {
+            const qreal ar = m_width / m_height;
+            const qreal ssar = m_imageSize.width() / (qreal)m_imageSize.height();
+            if (ar > ssar) {
+                setSourceSize(QSize(m_width, 0));
+            } else {
+                setSourceSize(QSize(0, m_height));
+            }
+        } else {
+            qWarning() << "Invalid size for " << m_source << m_imageSize;
+            setSourceSize(QSize(0, 0));
+        }
+    } else {
+        setSourceSize(QSize(-1, -1));
+    }
+}
 
=== added file 'plugins/Dash/croppedimagesizer.h'
--- plugins/Dash/croppedimagesizer.h	1970-01-01 00:00:00 +0000
+++ plugins/Dash/croppedimagesizer.h	2015-01-13 15:16:16 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CROPPEDIMAGESIZER_H
+#define CROPPEDIMAGESIZER_H
+
+#include <QImageReader>
+#include <QObject>
+#include <QSize>
+#include <QUrl>
+
+class CroppedImageSizerAsyncWorker;
+
+class CroppedImageSizer : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)
+    Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)
+    Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
+
+public:
+    CroppedImageSizer();
+    ~CroppedImageSizer();
+
+    QUrl source() const;
+    void setSource(const QUrl &source);
+
+    qreal width() const;
+    void setWidth(qreal width);
+
+    qreal height() const;
+    void setHeight(qreal height);
+
+    QSize sourceSize() const;
+    void setSourceSize(const QSize &sourceSize);
+
+    Q_INVOKABLE void setImageSize(const QSize &imageSize);
+
+Q_SIGNALS:
+    void inputParamsChanged();
+    void sourceChanged();
+    void sourceSizeChanged();
+
+private Q_SLOT:
+    void calculateSourceSize();
+    void requestImage();
+
+private:
+    QUrl m_source;
+    qreal m_width;
+    qreal m_height;
+    QSize m_sourceSize;
+    QSize m_imageSize;
+    QPointer<CroppedImageSizerAsyncWorker> m_worker;
+};
+
+#endif
 
=== added file 'plugins/Dash/croppedimagesizerasyncworker.cpp'
--- plugins/Dash/croppedimagesizerasyncworker.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Dash/croppedimagesizerasyncworker.cpp	2015-01-13 15:16:16 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "croppedimagesizerasyncworker.h"
+
+#include "croppedimagesizer.h"
+
+#include <QNetworkReply>
+#include <QtConcurrentRun>
+
+CroppedImageSizerAsyncWorker::CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply)
+ : m_sizer(sizer),
+   m_reply(reply),
+   m_ignoreAbort(false)
+{
+    connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizerAsyncWorker::requestFinished);
+}
+
+void CroppedImageSizerAsyncWorker::abort()
+{
+    // This runs on main thread
+    QMutexLocker locker(&m_mutex);
+    m_sizer = nullptr;
+    // If we already started the future run we can't abort the reply
+    // since we don't know at which stage the future is, just let it finish
+    if (!m_ignoreAbort) {
+        QMetaObject::invokeMethod(m_reply, "abort", Qt::QueuedConnection);
+    }
+}
+
+void CroppedImageSizerAsyncWorker::requestFinished()
+{
+    // This runs on main thread
+    QMutexLocker locker(&m_mutex);
+    if (m_sizer) {
+        m_ignoreAbort = true;
+        QtConcurrent::run(processRequestFinished, this);
+    } else {
+        // We were aborted delete ourselves
+        m_reply->deleteLater();
+        deleteLater();
+    }
+}
+
+void CroppedImageSizerAsyncWorker::processRequestFinished(CroppedImageSizerAsyncWorker *worker)
+{
+    // This runs on non main thread
+    // m_reply has finished at this point and is protected against change by m_ignoreAbort
+    QImageReader reader(worker->m_reply);
+    const QSize imageSize = reader.size();
+
+    worker->m_mutex.lock();
+    if (worker->m_sizer) {
+        QMetaObject::invokeMethod(worker->m_sizer, "setImageSize", Qt::QueuedConnection, Q_ARG(QSize, imageSize));
+    }
+    worker->m_mutex.unlock();
+
+    // All work is done, delete ourselves
+    worker->m_reply->deleteLater();
+    worker->deleteLater();
+}
 
=== added file 'plugins/Dash/croppedimagesizerasyncworker.h'
--- plugins/Dash/croppedimagesizerasyncworker.h	1970-01-01 00:00:00 +0000
+++ plugins/Dash/croppedimagesizerasyncworker.h	2015-01-13 15:16:16 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CROPPEDIMAGESIZERASYNCWORKER_H
+#define CROPPEDIMAGESIZERASYNCWORKER_H
+
+#include <QMutex>
+#include <QObject>
+
+class CroppedImageSizer;
+
+class QNetworkReply;
+
+class CroppedImageSizerAsyncWorker : public QObject
+{
+    Q_OBJECT
+public:
+    CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply);
+
+    void abort();
+
+private Q_SLOTS:
+    void requestFinished();
+
+private:
+    static void processRequestFinished(CroppedImageSizerAsyncWorker *worker);
+
+    QMutex m_mutex;
+    CroppedImageSizer *m_sizer;
+    QNetworkReply *m_reply;
+    bool m_ignoreAbort;
+};
+
+#endif
 
=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2014-10-13 15:42:02 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2015-01-13 15:16:16 +0000
@@ -334,13 +334,18 @@
     return m_headerItemShownHeight;
 }
 
-qreal ListViewWithPageHeader::cacheBuffer() const
+int ListViewWithPageHeader::cacheBuffer() const
 {
     return m_cacheBuffer;
 }
 
-void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
 {
+    if (cacheBuffer < 0) {
+        qmlInfo(this) << "Cannot set a negative cache buffer";
+        return;
+    }
+
     if (cacheBuffer != m_cacheBuffer) {
         m_cacheBuffer = cacheBuffer;
         Q_EMIT cacheBufferChanged();
 
=== modified file 'plugins/Dash/listviewwithpageheader.h'
--- plugins/Dash/listviewwithpageheader.h	2014-10-10 11:13:26 +0000
+++ plugins/Dash/listviewwithpageheader.h	2015-01-13 15:16:16 +0000
@@ -54,7 +54,7 @@
     Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
     Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
     Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
-    Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
+    Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
 
     friend class ListViewWithPageHeaderTest;
     friend class ListViewWithPageHeaderTestSection;
@@ -85,8 +85,8 @@
     int stickyHeaderHeight() const;
     qreal headerItemShownHeight() const;
 
-    qreal cacheBuffer() const;
-    void setCacheBuffer(qreal cacheBuffer);
+    int cacheBuffer() const;
+    void setCacheBuffer(int cacheBuffer);
 
     Q_INVOKABLE void positionAtBeginning();
     Q_INVOKABLE void showHeader();
@@ -204,7 +204,7 @@
     bool m_forceNoClip;
     bool m_inLayout;
     bool m_inContentHeightKeepHeaderShown;
-    qreal m_cacheBuffer;
+    int m_cacheBuffer;
 
     // Qt 5.0 doesn't like releasing the items just after itemCreated
     // so we delay the releasing until the next updatePolish
 
=== modified file 'plugins/Dash/plugin.cpp'
--- plugins/Dash/plugin.cpp	2014-04-30 10:06:33 +0000
+++ plugins/Dash/plugin.cpp	2015-01-13 15:16:16 +0000
@@ -17,6 +17,7 @@
 
 #include "plugin.h"
 
+#include "croppedimagesizer.h"
 #include "horizontaljournal.h"
 #include "listviewwithpageheader.h"
 #include "organicgrid.h"
@@ -32,4 +33,5 @@
     qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");
     qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");
     qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");
+    qmlRegisterType<CroppedImageSizer>(uri, 0, 1, "CroppedImageSizer");
 }
 
=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2014-10-02 11:08:26 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2015-01-13 15:16:16 +0000
@@ -45,6 +45,7 @@
     property alias rowSpacing: verticalJournalView.rowSpacing
     property alias model: verticalJournalView.model
     property alias delegate: verticalJournalView.delegate
+    property alias cacheBuffer: verticalJournalView.cacheBuffer
     property alias displayMarginBeginning: verticalJournalView.displayMarginBeginning
     property alias displayMarginEnd: verticalJournalView.displayMarginEnd
 
 
=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2014-09-12 09:31:56 +0000
+++ qml/Dash/CardCarousel.qml	2015-01-13 15:16:16 +0000
@@ -52,6 +52,7 @@
             function pressAndHold() { cardCarousel.pressAndHold(index, model.result, model) }
 
             sourceComponent: cardTool.cardComponent
+            asynchronous: true
             onLoaded: {
                 item.fixedHeaderHeight = Qt.binding(function() { return carousel.headerHeight; });
                 item.height = Qt.binding(function() { return cardTool.cardHeight; });
 
=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2014-09-30 09:23:23 +0000
+++ qml/Dash/CardGrid.qml	2015-01-13 15:16:16 +0000
@@ -50,12 +50,11 @@
         model: root.model
         displayMarginBeginning: root.displayMarginBeginning
         displayMarginEnd: root.displayMarginEnd
-        cacheBuffer: 0
+        cacheBuffer: root.cacheBuffer
         interactive: false
         delegate: Item {
             width: grid.cellWidth
             height: grid.cellHeight
-            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
             Loader {
                 id: loader
                 sourceComponent: cardTool.cardComponent
 
=== modified file 'qml/Dash/CardHorizontalList.qml'
--- qml/Dash/CardHorizontalList.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/CardHorizontalList.qml	2015-01-13 15:16:16 +0000
@@ -42,6 +42,7 @@
             sourceComponent: cardTool.cardComponent
             anchors { top: parent.top; bottom: parent.bottom }
             width: cardTool.cardWidth
+            asynchronous: true
             onLoaded: {
                 item.objectName = "delegate" + index;
                 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
 
=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2014-10-15 15:03:51 +0000
+++ qml/Dash/CardVerticalJournal.qml	2015-01-13 15:16:16 +0000
@@ -59,6 +59,7 @@
         rowSpacing: minimumColumnSpacing
         columnWidth: cardTool.cardWidth
 
+        cacheBuffer: root.cacheBuffer
         displayMarginBeginning: root.displayMarginBeginning
         displayMarginEnd: root.displayMarginEnd
 
@@ -66,7 +67,6 @@
             id: loader
             sourceComponent: cardTool.cardComponent
             width: cardTool.cardWidth
-            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
             onLoaded: {
                 item.objectName = "delegate" + index;
                 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
 
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-12-12 11:25:10 +0000
+++ qml/Dash/DashContent.qml	2015-01-13 15:16:16 +0000
@@ -163,6 +163,7 @@
 
             delegate:
                 Loader {
+                    id: loader
                     width: ListView.view.width
                     height: ListView.view.height
                     opacity: { // hide delegate if offscreen
@@ -191,6 +192,7 @@
                         dashContent.scopeLoaded(item.scope.id)
                         item.paginationCount = Qt.binding(function() { return dashContentList.count } )
                         item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
+                        item.visibleToParent = Qt.binding(function() { return loader.opacity != 0 });
                         item.holdingList = dashContentList;
                         item.forceNonInteractive = Qt.binding(function() { return dashContent.forceNonInteractive } )
                     }
 
=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-10-02 09:53:26 +0000
+++ qml/Dash/DashRenderer.qml	2015-01-13 15:16:16 +0000
@@ -23,14 +23,12 @@
 
     property int collapsedItemCount: -1
 
+    property int cacheBuffer: 0
+
     property int displayMarginBeginning: 0
 
     property int displayMarginEnd: 0
 
-    property int visibleRangeBegin: 0
-
-    property int visibleRangeEnd: 0
-
     property real originY: 0
 
     // The model to renderer
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-12-15 23:02:35 +0000
+++ qml/Dash/GenericScopeView.qml	2015-01-13 15:16:16 +0000
@@ -38,8 +38,10 @@
     readonly property alias subPageShown: subPageLoader.subPageShown
     property int paginationCount: 0
     property int paginationIndex: 0
+    property bool visibleToParent: false
     property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
     property var holdingList: null
+    property bool wasCurrentOnMoveStart: false
 
     property var scopeStyle: ScopeStyle {
         style: scope ? scope.customizations : {}
@@ -115,6 +117,9 @@
     }
 
     onIsCurrentChanged: {
+        if (!holdingList || !holdingList.moving) {
+            wasCurrentOnMoveStart = scopeView.isCurrent;
+        }
         if (pageHeaderLoader.item && showPageHeader) {
             pageHeaderLoader.item.resetSearch();
         }
@@ -141,6 +146,15 @@
         onHideDash: subPageLoader.closeSubPage()
     }
 
+    Connections {
+        target: holdingList
+        onMovingChanged: {
+            if (!moving) {
+                wasCurrentOnMoveStart = scopeView.isCurrent;
+            }
+        }
+    }
+
     Rectangle {
         anchors.fill: parent
         color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"
@@ -357,6 +371,7 @@
                 Connections {
                     target: scopeView
                     onIsCurrentChanged: rendererLoader.updateRanges();
+                    onVisibleToParentChanged: rendererLoader.updateRanges();
                 }
                 Connections {
                     target: holdingList
@@ -364,7 +379,13 @@
                 }
 
                 function updateRanges() {
-                    if (holdingList && holdingList.moving) {
+                    // Don't want to create stress by requesting more items during scope
+                    // changes so unless you're not part of the visible scopes just return.
+                    // For the visible scopes we need to do some work, the previously non visible
+                    // scope needs to adjust its ranges so that we define the new visible range,
+                    // that still means no creation/destruction of delegates, it's just about changing
+                    // the culling of the items so they are actually visible
+                    if (holdingList && holdingList.moving && !scopeView.visibleToParent) {
                         return;
                     }
 
@@ -379,31 +400,61 @@
                         }
                     }
 
-                    if (item && item.hasOwnProperty("visibleRangeBegin")) {
-                        item.visibleRangeBegin = Math.max(-baseItem.y, 0)
-                        item.visibleRangeEnd = item.visibleRangeBegin + Math.min(categoryView.height, rendererLoader.height)
-                    }
-
                     if (item && item.hasOwnProperty("displayMarginBeginning")) {
-                        // TODO do we need item.originY here, test 1300302 once we have a silo
-                        // and we can run it on the phone
-                        if (scopeView.isCurrent) {
-                            // 1073741823 is s^30 -1. A quite big number so that you have "infinite" display margin, but not so
-                            // big so that if you add if with itself you're outside the 2^31 int range
-                            item.displayMarginBeginning = 1073741823;
-                            item.displayMarginEnd = 1073741823;
-                        } else if (baseItem.y + baseItem.height <= 0) {
-                            // Not visible (item at top of the list viewport)
-                            item.displayMarginBeginning = -baseItem.height;
-                            item.displayMarginEnd = 0;
-                        } else if (baseItem.y >= categoryView.height) {
-                            // Not visible (item at bottom of the list viewport)
-                            item.displayMarginBeginning = 0;
-                            item.displayMarginEnd = -baseItem.height;
+                        // A item view creates its delegates synchronously from
+                        //     -displayMarginBeginning
+                        // to
+                        //     height + displayMarginEnd
+                        // Around that area it adds the cacheBuffer area where delegates are created async
+                        //
+                        // We adjust displayMarginBeginning and displayMarginEnd so
+                        //   * In non visible scopes nothing is considered visible and we set cacheBuffer
+                        //     so that creates the items that would be in the viewport asynchronously
+                        //   * For the current scope set the visible range to the viewport and then
+                        //     use cacheBuffer to create extra items for categoryView.height * 1.5
+                        //     to make scrolling nicer by mantaining a higher number of
+                        //     cached items
+                        //   * For non current but visible scopes (i.e. when the user changes from one scope
+                        //     to the next, we set the visible range to the viewport so
+                        //     items are not culled (invisible) but still use no cacheBuffer
+                        //     (it will be set once the scope is the current one)
+                        var displayMarginBeginning = baseItem.y;
+                        displayMarginBeginning = -Math.max(-displayMarginBeginning, 0);
+                        displayMarginBeginning = -Math.min(-displayMarginBeginning, baseItem.height);
+                        displayMarginBeginning = Math.round(displayMarginBeginning);
+                        var displayMarginEnd = -baseItem.height + seeAll.height + categoryView.height - baseItem.y;
+                        displayMarginEnd = -Math.max(-displayMarginEnd, 0);
+                        displayMarginEnd = -Math.min(-displayMarginEnd, baseItem.height);
+                        displayMarginEnd = Math.round(displayMarginEnd);
+                        if (scopeView.isCurrent || scopeView.visibleToParent) {
+                            item.displayMarginBeginning = displayMarginBeginning;
+                            item.displayMarginEnd = displayMarginEnd;
+                            if (holdingList && holdingList.moving) {
+                                // If we are moving we need to reset the cache buffer of the
+                                // view that was not visible (i.e. !wasCurrentOnMoveStart) to 0 since
+                                // otherwise the cache buffer we had set to preload the items of the
+                                // visible range will trigger some item creations and we want move to
+                                // be as smooth as possible meaning no need creations
+                                if (!wasCurrentOnMoveStart) {
+                                    item.cacheBuffer = 0;
+                                }
+                            } else {
+                                item.cacheBuffer = categoryView.height * 1.5;
+                            }
                         } else {
-                            item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y, 0));
-                            item.displayMarginEnd = -Math.round(Math.max(baseItem.height - seeAll.height -
-                                                                         categoryView.height + baseItem.y, 0));
+                            var visibleRange = baseItem.height + displayMarginEnd + displayMarginBeginning;
+                            if (visibleRange < 0) {
+                                item.displayMarginBeginning = displayMarginBeginning;
+                                item.displayMarginEnd = displayMarginEnd;
+                                item.cacheBuffer = 0;
+                            } else {
+                                // This should be visibleRange/2 in each of the properties
+                                // but some item views still (like GridView) like creating sync delegates even if
+                                // the visible range is 0 so let's make sure the visible range is negative
+                                item.displayMarginBeginning = displayMarginBeginning - visibleRange;
+                                item.displayMarginEnd = displayMarginEnd - visibleRange;
+                                item.cacheBuffer = visibleRange;
+                            }
                         }
                     }
                 }
 
=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
--- qml/Dash/Previews/PreviewZoomableImage.qml	2014-10-22 17:35:15 +0000
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-01-13 15:16:16 +0000
@@ -40,6 +40,7 @@
         }
         scaleTo: "height"
         source: widgetData["source"]
+        asynchronous: true
 
         borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"
 
 
=== modified file 'qml/Dash/ScopeListView.qml'
--- qml/Dash/ScopeListView.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/ScopeListView.qml	2015-01-13 15:16:16 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,5 +20,7 @@
 ListViewWithPageHeader {
     maximumFlickVelocity: height * 10
     flickDeceleration: height * 2
-    cacheBuffer: Number.MAX_VALUE
+    // 1073741823 is s^30 -1. A quite big number so that you have "infinite" cache, but not so
+    // big so that if you add if with itself you're outside the 2^31 int range
+    cacheBuffer: 1073741823
 }
 
=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2014-11-05 00:19:41 +0000
+++ qml/Greeter/Infographics.qml	2015-01-13 15:16:16 +0000
@@ -127,7 +127,7 @@
 
                 index: model.index
                 count: pastCircles.count
-                radius: parent.width / 2
+                radius: dataCircle.width / 2
                 halfSize: pastCircle.width / 2
                 posOffset: 0.0
 
@@ -187,7 +187,7 @@
 
                 index: model.index
                 count: presentCircles.count
-                radius: parent.width / 2
+                radius: dataCircle.width / 2
                 halfSize: presentCircle.width / 2
                 posOffset: 0.0
 
@@ -255,14 +255,16 @@
             interval: animDuration * 0.5; running: false; repeat: true
             onTriggered: {
                 if (dotCounter < dots.count) {
-                    var nextDot = dots.itemAt(dotCounter++)
-                    nextDot.unlockAnimation.start()
+                    var nextDot = dots.itemAt(dotCounter);
+                    if (nextDot) {
+                        nextDot.unlockAnimation.start();
+                        if (++dotCounter == Math.round(dots.count / 2)) {
+                            circleChangeAnimTimer.startFromBeginning();
+                        }
+                    }
                 } else {
                     stop()
                 }
-                if (dotCounter == Math.round(dots.count / 2)) {
-                    circleChangeAnimTimer.startFromBeginning()
-                }
             }
 
             function startFromBeginning() {
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-12-05 16:27:27 +0000
+++ qml/Shell.qml	2015-01-13 15:16:16 +0000
@@ -353,7 +353,7 @@
 
         function maybeShow() {
             if (!shell.forcedUnlock) {
-                show()
+                showNow();
             }
         }
 
@@ -557,6 +557,15 @@
                 enabled = true;
             }
 
+            Timer {
+                // See powerConnection for why this is useful
+                id: showGreeterDelayed
+                interval: 1
+                onTriggered: {
+                    greeter.showNow();
+                }
+            }
+
             onShownChanged: {
                 if (shown) {
                     // Disable everything so that user can't swipe greeter or
@@ -622,7 +631,16 @@
         onStatusChanged: {
             if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
                     !callManager.hasCalls && !edgeDemo.running) {
-                greeter.showNow()
+                // We don't want to simply call greeter.showNow() here, because
+                // that will take too long.  Qt will delay button event
+                // handling until the greeter is done loading and may think the
+                // user held down the power button the whole time, leading to a
+                // power dialog being shown.  Instead, delay showing the
+                // greeter until we've finished handling the event.  We could
+                // make the greeter load asynchronously instead, but that
+                // introduces a whole host of timing issues, especially with
+                // its animations.  So this is simpler.
+                showGreeterDelayed.start();
             }
         }
     }
 
=== renamed file 'qml/graphics/applicationIcons/[e-mail]' => 'qml/graphics/applicationIcons/dash.png'
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-10-30 14:38:28 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2015-01-13 15:16:16 +0000
@@ -204,7 +204,7 @@
 
         """
         category_element = self._get_category_element(category)
-        icon = category_element.select_single('AbstractButton', title=title)
+        icon = category_element.wait_select_single('AbstractButton', title=title)
         self.pointing_device.click_object(icon)
 
     def _get_category_element(self, category):
 
=== modified file 'tests/plugins/Dash/CMakeLists.txt'
--- tests/plugins/Dash/CMakeLists.txt	2014-09-01 09:13:08 +0000
+++ tests/plugins/Dash/CMakeLists.txt	2015-01-13 15:16:16 +0000
@@ -80,3 +80,4 @@
 add_qml_test(. ScopeStyle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(. ListViewWithPageHeaderQML IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(. CardAttributes IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
+add_qml_test(. CroppedImageMinimumSourceSize IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
 
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2014-10-20 20:51:10 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2015-01-13 15:16:16 +0000
@@ -46,16 +46,16 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
                                         } 
                                     } 
-                                    image: CroppedImageMinimumSourceSize {
+                                    CroppedImageMinimumSourceSize {
+                                        id: artImage;
                                         objectName: "artImage"; 
-                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
-                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
-                                        cache: true; 
+                                        source: cardData && cardData["art"] || ""; 
                                         asynchronous: root.asynchronous; 
                                         visible: false; 
                                         width: root.width; 
                                         height: width / artShape.aspect; 
                                     } 
+                                    image: artImage.image; 
                                 } 
                             } 
                         }
 
=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2014-10-20 20:51:10 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2015-01-13 15:16:16 +0000
@@ -68,13 +68,12 @@
                             id: mascotImage; 
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
-                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
-                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
+                            source: cardData && cardData["mascot"] || ""; 
                             width: units.gu(6); 
                             height: units.gu(5.625); 
                             horizontalAlignment: Image.AlignHCenter; 
                             verticalAlignment: Image.AlignVCenter; 
-                            visible: showHeader && resized;
+                            visible: showHeader;
                         }
 ,Item { 
                             id: headerTitleContainer; 
 
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2014-10-20 20:51:10 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2015-01-13 15:16:16 +0000
@@ -46,16 +46,16 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
                                         }
                                     } 
-                                    image: CroppedImageMinimumSourceSize {
-                                        objectName: "artImage"; 
-                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
-                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
-                                        cache: true;
-                                        asynchronous: root.asynchronous; 
-                                        visible: false; 
-                                        width: root.width; 
-                                        height: width / artShape.aspect; 
-                                    } 
+                                    CroppedImageMinimumSourceSize {
+                                        id: artImage;
+                                        objectName: "artImage";
+                                        source: cardData && cardData["art"] || ""; 
+                                        asynchronous: root.asynchronous;
+                                        visible: false;
+                                        width: root.width;
+                                        height: width / artShape.aspect;
+                                    }
+                                    image: artImage.image; 
                                 } 
                             } 
                         }
 
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2014-10-20 20:51:10 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2015-01-13 15:16:16 +0000
@@ -35,11 +35,11 @@
                         id: mascotShapeLoader; 
                         objectName: "mascotShapeLoader"; 
                         asynchronous: root.asynchronous; 
-                        active: mascotImage.status === Image.Ready; 
+                        active: mascotImage.image.status === Image.Ready;
                         visible: showHeader && active && status == Loader.Ready; 
                         width: units.gu(6); 
                         height: units.gu(5.625); 
-                        sourceComponent: UbuntuShape { image: mascotImage } 
+                        sourceComponent: UbuntuShape { image: mascotImage.image }
                         anchors { verticalCenter: parent.verticalCenter; }
                     }
 
@@ -47,8 +47,7 @@
                     id: mascotImage; 
                     objectName: "mascotImage"; 
                     anchors { verticalCenter: parent.verticalCenter; }
-                    property bool doLoadSource: !NetworkingStatus.limitedBandwith;
-                    source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
+                    source: cardData && cardData["mascot"] || ""; 
                     width: units.gu(6);
                     height: units.gu(5.625); 
                     horizontalAlignment: Image.AlignHCenter; 
 
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2014-10-20 20:51:10 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2015-01-13 15:16:16 +0000
@@ -46,16 +46,16 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
                                         }
                                     } 
-                                    image: CroppedImageMinimumSourceSize {
-                                        objectName: "artImage"; 
-                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
-                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
-                                        cache: true;
-                                        asynchronous: root.asynchronous; 
-                                        visible: false; 
-                                        width: root.width; 
-                                        height: width / artShape.aspect; 
-                                    } 
+                                    CroppedImageMinimumSourceSize {
+                                        id: artImage;
+                                        objectName: "artImage";
+                                        source: cardData && cardData["art"] || ""; 
+                                        asynchronous: root.asynchronous;
+                                        visible: false;
+                                        width: root.width;
+                                        height: width / artShape.aspect;
+                                    }
+                                    image: artImage.image; 
                                 } 
                             }
                         }
 
=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2014-10-20 20:51:10 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2015-01-13 15:16:16 +0000
@@ -68,13 +68,12 @@
                             id: mascotImage; 
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
-                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
-                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
+                            source: cardData && cardData["mascot"] || ""; 
                             width: units.gu(6);
                             height: units.gu(5.625); 
                             horizontalAlignment: Image.AlignHCenter; 
                             verticalAlignment: Image.AlignVCenter; 
-                            visible: showHeader && resized;
+                            visible: showHeader;
                         }
 
 ,Item { 
 
=== modified file 'tests/plugins/Dash/horizontaljournaltest.qml'
--- tests/plugins/Dash/horizontaljournaltest.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/horizontaljournaltest.qml	2015-01-13 15:16:16 +0000
@@ -25,6 +25,7 @@
         rowHeight: 150
         columnSpacing: 10
         rowSpacing: 10
+        cacheBuffer: Math.max(0, (height + displayMarginEnd + displayMarginBeginning) / 2)
 
         delegate: Rectangle {
             property real randomValue: Math.random()
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
--- tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-08-26 08:41:02 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2015-01-13 15:16:16 +0000
@@ -1920,7 +1920,7 @@
 
     void testAllCacheBuffer()
     {
-        lvwph->setCacheBuffer(std::numeric_limits<qreal>::max());
+        lvwph->setCacheBuffer(std::numeric_limits<int>::max());
         QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);
         QCOMPARE(lvwph->m_firstVisibleIndex, 0);
         verifyItem(0, 50., 150., false);
 
=== modified file 'tests/plugins/Dash/organicgridtest.qml'
--- tests/plugins/Dash/organicgridtest.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/organicgridtest.qml	2015-01-13 15:16:16 +0000
@@ -27,6 +27,7 @@
         rowSpacing: 10
         smallDelegateSize: Qt.size(90, 90)
         bigDelegateSize: Qt.size(180, 180)
+        cacheBuffer: Math.max(0, (height + displayMarginEnd + displayMarginBeginning) / 2)
 
         delegate: Rectangle {
             property real randomValue: Math.random()
 
=== added file 'tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml'
--- tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-01-13 15:16:16 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import QtTest 1.0
+import Ubuntu.Components 1.1
+import Dash 0.1
+
+Rectangle {
+    width: 500
+    height: 300
+
+    color: "red"
+
+    CroppedImageMinimumSourceSize {
+        id: cimss
+        x: 100
+        y: 100
+        width: 100
+        height: 100
+        source: Qt.resolvedUrl("../../qmltests/Dash/artwork/music-player-design.png")
+        asynchronous: true
+    }
+
+    TestCase {
+        id: testCase
+        name: "ScopeStyle"
+        when: windowShown
+
+        function test_croppedSource() {
+            tryCompare(cimss.image.sourceSize, "width", 100);
+            tryCompare(cimss.image.sourceSize, "height", 0);
+
+            cimss.width = 40;
+            tryCompare(cimss.image.sourceSize, "width", 0);
+            tryCompare(cimss.image.sourceSize, "height", 100);
+
+            cimss.width = 100;
+            tryCompare(cimss.image.sourceSize, "width", 100);
+            tryCompare(cimss.image.sourceSize, "height", 0);
+        }
+    }
+}
 
=== modified file 'tests/plugins/Dash/verticaljournaltest.qml'
--- tests/plugins/Dash/verticaljournaltest.qml	2014-04-30 10:06:33 +0000
+++ tests/plugins/Dash/verticaljournaltest.qml	2015-01-13 15:16:16 +0000
@@ -26,6 +26,7 @@
         columnWidth: 150
         columnSpacing: 10
         rowSpacing: 10
+        cacheBuffer: Math.max(0, (height + displayMarginEnd + displayMarginBeginning) / 2)
 
         delegate: Rectangle {
             property real randomValue: Math.random()
 
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2014-10-14 15:44:00 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2015-01-13 15:16:16 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 0.1
-import Ubuntu.Connectivity 1.0
 import Unity.Test 0.1 as UT
 import "../../../qml/Dash"
 import "CardHelpers.js" as Helpers
@@ -221,7 +220,6 @@
 
         function init() {
             loader.visible = true;
-            NetworkingStatus.limitedBandwith = false;
         }
 
         function cleanup() {
@@ -585,25 +583,5 @@
                 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
             }
         }
-
-        function test_load_images_visibility_network_data() {
-            return [
-                { tag: "Visible, network", visible: true, limitedBandwith: false },
-                { tag: "Visible, no network", visible: true, limitedBandwith: true },
-                { tag: "Not Visible, network", visible: false, limitedBandwith: false },
-                { tag: "Not Visible, no network", visible: false, limitedBandwith: true }
-            ];
-        }
-
-        function test_load_images_visibility_network(data) {
-            loader.visible = data.visible;
-            NetworkingStatus.limitedBandwith = data.limitedBandwith;
-
-            selector.selectedIndex = 0;
-            waitForRendering(selector);
-            waitForRendering(card);
-
-            verify(data.visible || !data.limitedBandwith || artImage.source == "");
-        }
     }
 }
 
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2014-12-16 18:29:37 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2015-01-13 15:16:16 +0000
@@ -516,5 +516,62 @@
 
             compare(categoryListView.pageHeader.item.searchHint, "Search People");
         }
+
+        function compareArrays(a, b) {
+            if (a.length != b.length) return false;
+            for (var i in a) {
+                if (a[i] != b[i]) return false;
+            }
+            return true;
+        }
+
+        function getSettledButtons() {
+            var buttons = findChildsByType(dashContent, "AbstractButton");
+            wait(2500);
+            var aux = findChildsByType(dashContent, "AbstractButton");
+            while (!compareArrays(aux, buttons)) {
+                buttons = aux;
+                wait(2500);
+                aux = findChildsByType(dashContent, "AbstractButton");
+            }
+            return buttons;
+        }
+
+        function test_noDelegateCreationDestructionOnMove() {
+            // Our cards are of type AbstractButton as defined in CardCreator.js
+            // This gives also other things that are not cards but for our purpose it
+            // does not matter
+
+            // Wait for the buttons to settle
+            var buttons = getSettledButtons();
+
+            // Move the scopes so that the item on the right is the current one
+            // without releasing the button
+            mouseFlick(dashContent, dashContent.width - units.gu(1), units.gu(1), units.gu(1), units.gu(1), true, false);
+
+            // Make sure we have changed to a new scope
+            compare(dashContent.currentIndex, 1);
+
+            // Wait for the buttons to settle
+            var buttons2 = getSettledButtons();
+
+            // Verify we have exactly the same buttons as before starting to move
+            verify(compareArrays(buttons2, buttons));
+
+            // Release the mouse
+            mouseRelease(dashContent, units.gu(1), units.gu(1));
+
+            // Wait for the scopes list to stop moving
+            var dashContentList = findChild(dashContent, "dashContentList");
+            tryCompare(dashContentList, "moving", false);
+            compare(dashContent.currentIndex, 1);
+
+            // Wait for the buttons to settle
+            var buttons3 = getSettledButtons();
+
+            // Verify we have a different set of buttons now
+            expectFail("", "There has to be new cards after releasing the list is not moving anymore");
+            verify(compareArrays(buttons3, buttons));
+        }
     }
 }
 
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-12-15 23:02:35 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2015-01-13 15:16:16 +0000
@@ -59,6 +59,7 @@
     GenericScopeView {
         id: genericScopeView
         anchors.fill: parent
+        visibleToParent: true
 
         UT.UnityTestCase {
             id: testCase
@@ -293,6 +294,7 @@
                                     },
                                     true);
                 var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
+                waitForRendering(tile);
                 mouseClick(tile, tile.width / 2, tile.height / 2);
                 tryCompare(testCase.subPageLoader, "open", true);
                 tryCompare(testCase.subPageLoader, "x", 0);
 
=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-10-14 08:43:38 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-01-13 15:16:16 +0000
@@ -109,6 +109,18 @@
         return null;
     }
 
+    function findChildsByType(obj, typeName) {
+        var res = new Array(0);
+        for (var i in obj.children) {
+            var c = obj.children[i];
+            if (UT.Util.isInstanceOf(c, typeName)) {
+                res.push(c)
+            }
+            res = res.concat(findChildsByType(c, typeName));
+        }
+        return res;
+    }
+
     // Type a full string instead of keyClick letter by letter
     // TODO: this is not ugly, this is uber-ugly and does not support
     // any special character. Remove the keyMap once keyClick(obj, char)