feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix state switch

Browse Source
This commit is contained in:
Marco Bubke
2010-03-30 18:10:36 +02:00
committed by Kai Koehne
parent 0f1d26109c
commit ed6d283cd4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/core/model/qmlmodelview.cpp
View File

@@ -305,10 +305,7 @@ void QmlModelView::activateState(const QmlModelState &state)
} else { } else {
nodeInstanceView()->activateState(newStateInstance); nodeInstanceView()->activateState(newStateInstance);
} }
}
m_state = state;
stateChanged(state, oldState);}
void QmlModelView::changeToState(const ModelNode &node, const QString &stateName) void QmlModelView::changeToState(const ModelNode &node, const QString &stateName)
{ {
@@ -323,7 +320,8 @@ void QmlModelView::changeToState(const ModelNode &node, const QString &stateName
QmlModelState oldState = m_state; QmlModelState oldState = m_state;
if (newState.isValid() && oldState != newState) { if (newState.isValid() && oldState != newState) {
activateState(newState); m_state = newState;
stateChanged(newState, oldState);
} }
} }
@@ -340,7 +338,7 @@ void QmlModelView::otherPropertyChanged(const QmlObjectNode &/*qmlObjectNode*/,
{ {
} }
void QmlModelView::stateChanged(const QmlModelState &/*newQmlModelState*/, const QmlModelState &/*oldQmlModelState*/) void QmlModelView::stateChanged(const QmlModelState &newQmlModelState, const QmlModelState &/*oldQmlModelState*/)
{ {
} }