alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SortFilterModel: Do not sort by default

Browse Source 
It seems QML sets properties to their default value at startup and thus
calls setSortRole(QString()), which causes SortFilterModel to sort by
default.

CCMAIL: mart@kde.org
This commit is contained in:
Aurélien Gâteau 2012-06-13 23:56:13 +02:00
parent 01b7135299
commit 5c1e49fa76
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
declarativeimports/core/datamodel.cpp
View File

@ -103,9 +103,16 @@ QString SortFilterModel::filterRole() const
void SortFilterModel::setSortRole(const QString &role) void SortFilterModel::setSortRole(const QString &role)
{ {
QSortFilterProxyModel::setSortRole(roleNameToId(role)); if (m_sortRole == role) {
return;
}
m_sortRole = role; m_sortRole = role;
sort(0, sortOrder()); if (role.isEmpty()) {
sort(-1, Qt::AscendingOrder);
} else {
QSortFilterProxyModel::setSortRole(roleNameToId(role));
sort(0, sortOrder());
}
} }
QString SortFilterModel::sortRole() const QString SortFilterModel::sortRole() const