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

QuickDesigner: Reduce numbers of redraws / state switching in States Editor

Browse Source 
nodeInstancePropertyChanged() is called for _every_ state switch ... so
the current assumption that it only reflects real changes does not hold.

Instead, use the orphaned sceneChanged() method to schedule redraws.
However, this still results in some overhead when switching to the base state
(sceneChanged() cannot decide whether it has to redraw all other states
or not).

Reviewed-by: Christiaan Janssen
This commit is contained in:
Kai Koehne
2010-05-06 15:37:08 +02:00
parent 12d6f03d5f
commit 85f3472b22
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
View File

@@ -339,16 +339,11 @@ void StatesEditorView::nodeOrderChanged(const NodeListProperty &listProperty, co
void StatesEditorView::nodeInstancePropertyChanged(const ModelNode &node, const QString &propertyName)
{
if (!m_settingSilentState) {
if (QmlModelState(node).isValid()) {
startUpdateTimer(modelStateIndex(node) + 1, 0);
} else { //a change to the base state update all
for (int i = 0; i < m_modelStates.count(); ++i)
startUpdateTimer(i, 0);
}
}
// sets currentState() used in sceneChanged
QmlModelView::nodeInstancePropertyChanged(node, propertyName);
if (!m_settingSilentState)
sceneChanged();
}
void StatesEditorView::stateChanged(const QmlModelState &newQmlModelState, const QmlModelState &oldQmlModelState)
@@ -456,8 +451,11 @@ void StatesEditorView::sceneChanged()
if (debug)
qDebug() << __FUNCTION__;
// If we are in base state we have to update the pixmaps of all states
// otherwise only the pixmpap for the current state
// If we are in base state we have to update the pixmaps of all states,
// otherwise only the pixmap for the current state
// TODO: Since a switch to the base state also results in nodePropertyChanged and
// therefore sceneChanged calls, we're rendering too much here
if (currentState().isValid()) { //during setup we might get sceneChanged signals with an invalid currentState()
if (currentState().isBaseState()) {