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

QHeaderView: reset cached size hint on reset() 

QHeaderView::reset() did not reset the cached size hint which could lead
to wrong geometries when the model was reset.

Task-number: QTBUG-67927
Change-Id: I5100b28a741cc816133a229c422f9abf83f2187e
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
bb10
Christian Ehrlicher 2018-05-09 20:36:10 +02:00
parent d2573f4dbd
commit f02256cce1
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1853,11 +1853,13 @@ bool QHeaderView::restoreState(const QByteArray &state)
*/
void QHeaderView::reset()
{
Q_D(QHeaderView);
QAbstractItemView::reset();
// it would be correct to call clear, but some apps rely
// on the header keeping the sections, even after calling reset
//d->clear();
initializeSections();
d->invalidateCachedSizeHint();
}
/*!

44
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
View File

@ -243,6 +243,7 @@ private slots:
void testMinMaxSectionSizeStretched();
void testMinMaxSectionSizeNotStretched();
void sizeHintCrash();
void testResetCachedSizeHint();
protected:
void setupTestData(bool use_reset_model = false);
@ -265,13 +266,21 @@ Q_OBJECT
public:
QtTestModel(QObject *parent = 0): QAbstractTableModel(parent),
cols(0), rows(0), wrongIndex(false) {}
int rowCount(const QModelIndex&) const { return rows; }
int columnCount(const QModelIndex&) const { return cols; }
cols(0), rows(0), wrongIndex(false), m_bMultiLine(false) {}
int rowCount(const QModelIndex&) const override { return rows; }
int columnCount(const QModelIndex&) const override { return cols; }
bool isEditable(const QModelIndex &) const { return true; }
QVariant data(const QModelIndex &idx, int) const
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override
{
if (role == Qt::DisplayRole)
return m_bMultiLine ? QString("%1\n%1").arg(section) : QString::number(section);
return QAbstractTableModel::headerData(section, orientation, role);
}
QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override
{
if (role != Qt::DisplayRole)
return QVariant();
if (idx.row() < 0 || idx.column() < 0 || idx.column() >= cols || idx.row() >= rows) {
wrongIndex = true;
qWarning("Invalid modelIndex [%d,%d,%p]", idx.row(), idx.column(), idx.internalPointer());
@ -354,8 +363,16 @@ public:
emit layoutChanged();
}
void setMultiLineHeader(bool bEnable)
{
beginResetModel();
m_bMultiLine = bEnable;
endResetModel();
}
int cols, rows;
mutable bool wrongIndex;
bool m_bMultiLine;
};
// Testing get/set functions
@ -3337,6 +3354,25 @@ void tst_QHeaderView::testMinMaxSectionSize(bool stretchLastSection)
QCOMPARE(header.sectionSize(0), defaultSectionSize);
}
void tst_QHeaderView::testResetCachedSizeHint()
{
QtTestModel model;
model.rows = model.cols = 10;
QTableView tv;
tv.setModel(&model);
tv.show();
QVERIFY(QTest::qWaitForWindowExposed(&tv));
QSize s1 = tv.horizontalHeader()->sizeHint();
model.setMultiLineHeader(true);
QSize s2 = tv.horizontalHeader()->sizeHint();
model.setMultiLineHeader(false);
QSize s3 = tv.horizontalHeader()->sizeHint();
QCOMPARE(s1, s3);
QVERIFY(s1 != s2);
}
QTEST_MAIN(tst_QHeaderView)
#include "tst_qheaderview.moc"