emit runningChanged when AnimatedSprite stops by loops settings

Task-number: QTBUG-31522
Change-Id: I20718cda5f77f3a53176c8b1a4baacedd77375af
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index f09e9bb..c7c66d6 100644 (file)
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -377,8 +377,6 @@ QQuickAnimatedSprite::QQuickAnimatedSprite(QQuickItem *parent) :
     , m_pauseOffset(0)
 {
     setFlag(ItemHasContents);
-    connect(this, SIGNAL(runningChanged(bool)),
-            this, SLOT(update()));
     connect(this, SIGNAL(widthChanged()),
             this, SLOT(sizeVertices()));
     connect(this, SIGNAL(heightChanged()),
@@ -660,7 +658,10 @@ void QQuickAnimatedSprite::prepareNextFrame()
         }
         if (m_loops > 0 && m_curLoop >= m_loops) {
             frameAt = 0;
-            m_running = false;
+            if (m_running) {
+                m_running = false;
+                emit runningChanged(false);
+            }
         }
     } else {
         frameAt = m_curFrame;

diff --git a/tests/auto/quick/qquickanimatedsprite/data/runningChange.qml b/tests/auto/quick/qquickanimatedsprite/data/runningChange.qml
new file mode 100644 (file)
index 0000000..9994ff6
--- /dev/null
+++ b/tests/auto/quick/qquickanimatedsprite/data/runningChange.qml
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Tasuku Suzuki <stasuku@gmail.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    color: "black"
+    width: 320
+    height: 320
+
+    AnimatedSprite {
+        objectName: "sprite"
+        source: "squarefacesprite.png"
+        frameCount: 6
+        loops: 3
+        frameSync: true
+        running: false
+        width: 160
+        height: 160
+    }
+}

diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
index bf46b6e..6422e0b 100644 (file)
--- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
+++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
@@ -53,6 +53,7 @@ public:
 private slots:
     void initTestCase();
     void test_properties();
+    void test_runningChangedSignal();
     void test_frameChangedSignal();
 };
 
@@ -87,6 +88,29 @@ void tst_qquickanimatedsprite::test_properties()
     delete window;
 }
 
+void tst_qquickanimatedsprite::test_runningChangedSignal()
+{
+    QQuickView *window = new QQuickView(0);
+
+    window->setSource(testFileUrl("runningChange.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QVERIFY(window->rootObject());
+    QQuickAnimatedSprite* sprite = window->rootObject()->findChild<QQuickAnimatedSprite*>("sprite");
+    QVERIFY(sprite);
+
+    QVERIFY(!sprite->running());
+
+    QSignalSpy runningChangedSpy(sprite, SIGNAL(runningChanged(bool)));
+    sprite->setRunning(true);
+    QTRY_COMPARE(runningChangedSpy.count(), 1);
+    QTRY_VERIFY(!sprite->running());
+    QTRY_COMPARE(runningChangedSpy.count(), 2);
+
+    delete window;
+}
+
 void tst_qquickanimatedsprite::test_frameChangedSignal()
 {
     QQuickView *window = new QQuickView(0);