whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force properties to be applied in the order in which they are specified. 

Previously, property setting was randomized in order, which means that things
like: qproperty-foo: 4; qproperty-bar: 5; where foo may affect bar worked by
chance - or not at all - depending on the hash function.

Change-Id: Ifb9813ee72842cefb278cbedb644f24b91113f3f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
bb10
Robin Burchell 2012-03-05 15:05:16 +01:00 committed by Qt by Nokia
parent a71e12b170
commit 70cb55bc6d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -2498,7 +2498,13 @@ void QStyleSheetStyle::setGeometry(QWidget *w)
void QStyleSheetStyle::setProperties(QWidget *w)
{
// we have two data structures here: a hash of property -> value for lookup,
// and a vector giving properties in the order they are specified.
//
// this means we only set a property once (thanks to the hash) but we set
// properties in the order they are specified.
QHash<QString, QVariant> propertyHash;
QVector<QString> properties;
QVector<Declaration> decls = declarations(styleRules(w), QString());
// run through the declarations in order
@ -2535,10 +2541,17 @@ void QStyleSheetStyle::setProperties(QWidget *w)
#endif
default: v = decl.d->values.at(0).variant; break;
}
if (propertyHash.contains(property)) {
// we're ignoring the original appearance of this property
properties.remove(properties.indexOf(property));
}
propertyHash[property] = v;
properties.append(property);
}
// apply the values
const QList<QString> properties = propertyHash.keys();
// apply the values from left to right order
for (int i = 0; i < properties.count(); i++) {
const QString &property = properties.at(i);
w->setProperty(property.toLatin1(), propertyHash[property]);