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

QmlDesigner.propertyEditor: avoid binding loops for QColor by clever comparing

Browse Source
This commit is contained in:
Thomas Hartmann
2010-04-16 11:22:37 +02:00
parent a9a27f0847
commit 8c99d3a1bf
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,26 @@ static bool cleverDoubleCompare(QVariant value1, QVariant value2)
return false; return false;
} }
static bool cleverColorCompare(QVariant value1, QVariant value2)
{
if ((value1.type() == QVariant::Color) && (value2.type() == QVariant::Color)) {
QColor c1 = value1.value<QColor>();
QColor c2 = value2.value<QColor>();
QString a = c1.name();
QString b = c2.name();
if (a != b)
return false;
return (c1.alpha() == c2.alpha());
}
if ((value1.type() == QVariant::String) && (value2.type() == QVariant::Color)) {
return cleverColorCompare(QVariant(QColor(value1.toString())), value2);
}
if ((value1.type() == QVariant::Color) && (value2.type() == QVariant::String)) {
return cleverColorCompare(value1, QVariant(QColor(value2.toString())));
}
return false;
}
void PropertyEditorValue::setValueWithEmit(const QVariant &value) void PropertyEditorValue::setValueWithEmit(const QVariant &value)
{ {
if (m_value != value) { if (m_value != value) {
@@ -84,6 +104,8 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
if (cleverDoubleCompare(newValue, m_value)) if (cleverDoubleCompare(newValue, m_value))
return; return;
if (cleverColorCompare(newValue, m_value))
return;
setValue(newValue); setValue(newValue);
m_isBound = false; m_isBound = false;
emit valueChanged(name(), value); emit valueChanged(name(), value);
@@ -93,11 +115,15 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
void PropertyEditorValue::setValue(const QVariant &value) void PropertyEditorValue::setValue(const QVariant &value)
{ {
if ( m_value != value) { if ((m_value != value) &&
!cleverDoubleCompare(value, m_value) &&
!cleverColorCompare(value, m_value))
m_value = value; m_value = value;
}
emit valueChanged(QString(), value); emit valueChanged(QString(), value);
emit isBoundChanged(); emit isBoundChanged();
} }
QString PropertyEditorValue::expression() const QString PropertyEditorValue::expression() const