From c8cb154e167ae82e464b07aed8c5a0aac1112d9e Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 4 Aug 2011 13:51:24 +1000 Subject: [PATCH] Improved support for multiple to/from values in Transition. Trim the strings (previously "state1,state2" would work, but not "state1, state2", and document the feature. Task-number: QTBUG-14713 Change-Id: Ie0c5f803754751008c3e1bf766f08914f743338f Reviewed-on: http://codereview.qt.nokia.com/2592 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- src/declarative/util/qdeclarativestategroup.cpp | 4 ++++ src/declarative/util/qdeclarativetransition.cpp | 2 ++ src/qtquick1/util/qdeclarativestategroup.cpp | 4 ++++ src/qtquick1/util/qdeclarativetransition.cpp | 2 ++ 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index d52d54b..7200ac9 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -384,7 +384,11 @@ QDeclarativeTransition *QDeclarativeStateGroupPrivate::findTransition(const QStr QStringList toState; fromState = t->fromState().split(QLatin1Char(',')); + for (int jj = 0; jj < fromState.count(); ++jj) + fromState[jj] = fromState.at(jj).trimmed(); toState = t->toState().split(QLatin1Char(',')); + for (int jj = 0; jj < toState.count(); ++jj) + toState[jj] = toState.at(jj).trimmed(); if (ii == 1) qSwap(fromState, toState); int tScore = 0; diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 45d0721..e3af6b7 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -245,6 +245,8 @@ void QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &act The animation would only be applied when changing from the default state to the "brighter" state (i.e. when the mouse is pressed, but not on release). + Multiple \c to and \from values can be set by using a comma-separated string. + \sa reversible */ QString QDeclarativeTransition::fromState() const diff --git a/src/qtquick1/util/qdeclarativestategroup.cpp b/src/qtquick1/util/qdeclarativestategroup.cpp index 60ca08c..539fbba 100644 --- a/src/qtquick1/util/qdeclarativestategroup.cpp +++ b/src/qtquick1/util/qdeclarativestategroup.cpp @@ -385,7 +385,11 @@ QDeclarative1Transition *QDeclarative1StateGroupPrivate::findTransition(const QS QStringList toState; fromState = t->fromState().split(QLatin1Char(',')); + for (int jj = 0; jj < fromState.count(); ++jj) + fromState[jj] = fromState.at(jj).trimmed(); toState = t->toState().split(QLatin1Char(',')); + for (int jj = 0; jj < toState.count(); ++jj) + toState[jj] = toState.at(jj).trimmed(); if (ii == 1) qSwap(fromState, toState); int tScore = 0; diff --git a/src/qtquick1/util/qdeclarativetransition.cpp b/src/qtquick1/util/qdeclarativetransition.cpp index 8498f6c..b484873 100644 --- a/src/qtquick1/util/qdeclarativetransition.cpp +++ b/src/qtquick1/util/qdeclarativetransition.cpp @@ -247,6 +247,8 @@ void QDeclarative1Transition::prepare(QDeclarative1StateOperation::ActionList &a The animation would only be applied when changing from the default state to the "brighter" state (i.e. when the mouse is pressed, but not on release). + Multiple \c to and \from values can be set by using a comma-separated string. + \sa reversible */ QString QDeclarative1Transition::fromState() const -- 1.7.2.5