AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QHeaderView: check for changed roles in dataChanged()

Browse Source 
QHeaderView::dataChanged() did not check for the modified roles which
lead to unneeded size calculations even if the size did not change.
Avoid it by only looking at the relevant roles (DisplayRole, DecorationRole,
SizeHintRole and FontRole).

[ChangeLog][QtWidgets][QHeaderView] dataChanged now respects the given
roles to avoid useless recomputations

Fixes: QTBUG-71172
Change-Id: I0de53897347a72bddc425ae1fae8f2560ad0e977
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Christian Ehrlicher 2018-10-20 21:23:04 +02:00 committed by Luca Beldi
parent 5668e059f2
commit b53f997d8f
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/itemviews/qheaderview.cpp
View File

@ -3117,9 +3117,25 @@ void QHeaderView::scrollContentsBy(int dx, int dy)
\reimp
\internal
*/
void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &)
void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
{
Q_D(QHeaderView);
if (!roles.isEmpty()) {
const auto doesRoleAffectSize = [](int role) -> bool {
switch (role) {
case Qt::DisplayRole:
case Qt::DecorationRole:
case Qt::SizeHintRole:
case Qt::FontRole:
return true;
default:
// who knows what a subclass or custom style might do
return role >= Qt::UserRole;
}
};
if (std::none_of(roles.begin(), roles.end(), doesRoleAffectSize))
return;
}
d->invalidateCachedSizeHint();
if (d->hasAutoResizeSections()) {
bool resizeRequired = d->globalResizeMode == ResizeToContents;