aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickspriteimage.cpp
diff options
context:
space:
mode:
authorAlan Alpert <[email protected]>2011-12-22 10:51:23 +1000
committerQt by Nokia <[email protected]>2011-12-23 04:22:52 +0100
commit932a195dbaae92ce87b98beca29a25c9b8d6cf5b (patch)
tree2d965bbc788e3978fc5980836e3e1898d890f86b /src/quick/items/qquickspriteimage.cpp
parent1f4fe0aca4fc70ece7235623aaf88225531f1243 (diff)
Add currentSprite property to SpriteImage
Also renames goalState to goalSprite, to help distinguish it from item states. Change-Id: I77e81595586e69e47a50a7a767fdb7ad775ad7be Reviewed-by: Martin Jones <[email protected]>
Diffstat (limited to 'src/quick/items/qquickspriteimage.cpp')
-rw-r--r--src/quick/items/qquickspriteimage.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/quick/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp
index 1da46f2ae8..660606bc22 100644
--- a/src/quick/items/qquickspriteimage.cpp
+++ b/src/quick/items/qquickspriteimage.cpp
@@ -251,7 +251,12 @@ struct SpriteVertices {
Default is true.
*/
/*!
- \qmlproperty string QtQuick2::SpriteImage::goalState
+ \qmlproperty string QtQuick2::SpriteImage::goalSprite
+
+ The name of the Sprite which is currently animating.
+*/
+/*!
+ \qmlproperty string QtQuick2::SpriteImage::goalSprite
The name of the Sprite which the animation should move to.
@@ -296,11 +301,11 @@ void QQuickSpriteImage::jumpTo(const QString &sprite)
m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite), 0, true);
}
-void QQuickSpriteImage::setGoalState(const QString &sprite)
+void QQuickSpriteImage::setGoalSprite(const QString &sprite)
{
if (m_goalState != sprite){
m_goalState = sprite;
- emit goalStateChanged(sprite);
+ emit goalSpriteChanged(sprite);
m_spriteEngine->setGoal(m_spriteEngine->stateIndex(sprite));
}
}
@@ -360,6 +365,8 @@ QSGGeometryNode* QQuickSpriteImage::buildNode()
m_material->sheetHeight = image.height();
m_material->elementWidth = width();
m_material->elementHeight = height();
+ m_curState = m_spriteEngine->state(m_spriteEngine->curState())->name();
+ emit currentSpriteChanged(m_curState);
int vCount = 4;
int iCount = 6;
@@ -449,6 +456,8 @@ void QQuickSpriteImage::prepareNextFrame()
m_material->animY = m_spriteEngine->spriteY();
m_material->animWidth = m_spriteEngine->spriteWidth();
m_material->animHeight = m_spriteEngine->spriteHeight();
+ m_curState = m_spriteEngine->state(m_spriteEngine->curState())->name();
+ emit currentSpriteChanged(m_curState);
}
}