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

QmlDesigner: Remove double evaluation

Browse Source 
That calls are quite expesive. So there is no need to call them twice.

Change-Id: I4ef2f17693464573b7614a529038b0e06f887f49
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2025-05-24 14:20:00 +02:00
parent a043b7fa5e
commit 3ba7471b88
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
View File

@@ -72,9 +72,9 @@ static bool cleverColorCompare(const QVariant &value1, const QVariant &value2)
// "red" is the same color as "#ff0000" // "red" is the same color as "#ff0000"
// To simplify editing we convert all explicit color names in the hash format // To simplify editing we convert all explicit color names in the hash format
static void fixAmbigousColorNames(const ModelNode &modelNode, PropertyNameView name, QVariant *value) static void fixAmbigousColorNames(const NodeMetaInfo &metaInfo, QVariant *value)
{ {
if (auto metaInfo = modelNode.metaInfo(); metaInfo.property(name).propertyType().isColor()) { if (metaInfo.isColor()) {
if (value->typeId() == QMetaType::QColor) { if (value->typeId() == QMetaType::QColor) {
QColor color = value->value<QColor>(); QColor color = value->value<QColor>();
int alpha = color.alpha(); int alpha = color.alpha();
@@ -87,9 +87,9 @@ static void fixAmbigousColorNames(const ModelNode &modelNode, PropertyNameView n
} }
} }
static void fixUrl(const ModelNode &modelNode, PropertyNameView name, QVariant *value) static void fixUrl(const NodeMetaInfo &metaInfo, QVariant *value)
{ {
if (auto metaInfo = modelNode.metaInfo(); metaInfo.property(name).propertyType().isUrl()) { if (metaInfo.isUrl()) {
if (!value->isValid()) if (!value->isValid())
*value = QStringLiteral(""); *value = QStringLiteral("");
} }
@@ -132,8 +132,9 @@ void PropertyEditorValue::setValue(const QVariant &value)
if (!compareVariants(m_value, value) && !cleverDoubleCompare(value, m_value) && !colorsEqual) if (!compareVariants(m_value, value) && !cleverDoubleCompare(value, m_value) && !colorsEqual)
m_value = value; m_value = value;
fixAmbigousColorNames(modelNode(), name(), &m_value); auto propertyTypeMetaInfo = modelNode().metaInfo().property(name()).propertyType();
fixUrl(modelNode(), name(), &m_value); fixAmbigousColorNames(propertyTypeMetaInfo, &m_value);
fixUrl(propertyTypeMetaInfo, &m_value);
if (!colorsEqual) if (!colorsEqual)
emit valueChangedQml(); emit valueChangedQml();