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

QmlDesigner.PropertyEditor: Fix comparison of variants

Browse Source 
The comparison of variants is not symmetric because of implicit conversion.
QVariant(string) == QVariant(QColor) does for example ignore the
alpha channel, because the color is converted to a string ignoring
the alpha channel. By comparing the variants in both directions we
gain a symmetric comparison.

Task-number: QTCREATORBUG-12516
Change-Id: I2d7ce29c087964626c8093b25667f3f4a11f6da4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Thomas Hartmann
2014-06-26 16:47:43 +02:00
parent ae9af795e1
commit 9b6f9dfb89
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,9 +117,20 @@ static void fixUrl(const QmlDesigner::ModelNode &modelNode, const QmlDesigner::P
} }
} }
static bool compareVariants(const QVariant &value1, const QVariant &value2)
/* The comparison of variants is not symmetric because of implicit conversion.
* QVariant(string) == QVariant(QColor) does for example ignore the alpha channel,
* because the color is converted to a string ignoring the alpha channel.
* By comparing the variants in both directions we gain a symmetric comparison.
*/
{
return (value1 == value2)
&& (value2 == value1);
}
void PropertyEditorValue::setValueWithEmit(const QVariant &value) void PropertyEditorValue::setValueWithEmit(const QVariant &value)
{ {
if (m_value != value || isBound()) { if (!compareVariants(value, m_value ) || isBound()) {
QVariant newValue = value; QVariant newValue = value;
if (modelNode().isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name())) if (modelNode().isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name()))
if (modelNode().metaInfo().propertyTypeName(name()) == "QUrl") if (modelNode().metaInfo().propertyTypeName(name()) == "QUrl")
@@ -129,6 +140,7 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
return; return;
if (cleverColorCompare(newValue, m_value)) if (cleverColorCompare(newValue, m_value))
return; return;
setValue(newValue); setValue(newValue);
m_isBound = false; m_isBound = false;
emit valueChanged(name(), value); emit valueChanged(name(), value);
@@ -139,7 +151,7 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
void PropertyEditorValue::setValue(const QVariant &value) void PropertyEditorValue::setValue(const QVariant &value)
{ {
if ((m_value != value) && if (!compareVariants(m_value, value) &&
!cleverDoubleCompare(value, m_value) && !cleverDoubleCompare(value, m_value) &&
!cleverColorCompare(value, m_value)) !cleverColorCompare(value, m_value))