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

QmlDesigner.propertyEditor allow setting of expressions in states

Browse Source
This commit is contained in:
Thomas Hartmann
2010-04-21 14:49:17 +02:00
parent a85fae4ba3
commit 600ed1ebcc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

@@ -155,6 +155,8 @@ void PropertyEditor::NodeType::setValue(const QmlObjectNode & fxObjectNode, cons
propertyValue->setValue(value); propertyValue->setValue(value);
if (!fxObjectNode.hasBindingProperty(name)) if (!fxObjectNode.hasBindingProperty(name))
propertyValue->setExpression(value.toString()); propertyValue->setExpression(value.toString());
else
propertyValue->setExpression(fxObjectNode.expression(name));
} }
} }
@@ -469,10 +471,8 @@ void PropertyEditor::changeExpression(const QString &name)
} }
try { try {
if (fxObjectNode.currentState().isBaseState()) { if (fxObjectNode.expression(name) != value->expression() || !fxObjectNode.propertyAffectedByCurrentState(name))
if (fxObjectNode.modelNode().bindingProperty(name).expression() != value->expression()) fxObjectNode.setBindingProperty(name, value->expression());
fxObjectNode.modelNode().bindingProperty(name).setExpression(value->expression());
}
} }
catch (RewritingException &e) { catch (RewritingException &e) {