From fcc01e6c3736991db2191c151111f03016d2d80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lund=20Martsum?= Date: Sat, 10 Mar 2012 16:47:02 +0100 Subject: QHeaderView - minor fix to setDefaultSectionSize This fixes a situation where we (wrongly) assume that a section with size 0 is hidden. However a hidden section should be one that we have called hideSection (or setSectionHidden) on. Change-Id: Ic14eded2666022f27434dc55927323a74910549c Reviewed-by: Stephen Kelly --- .../itemviews/qheaderview/tst_qheaderview.cpp | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'tests/auto/widgets/itemviews') diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 9ad71771c5..1158a9f06b 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -170,6 +170,7 @@ private slots: void moveSectionAndReset(); void moveSectionAndRemove(); void saveRestore(); + void defaultSectionSizeTest(); void defaultAlignment_data(); void defaultAlignment(); @@ -1625,6 +1626,32 @@ void tst_QHeaderView::saveRestore() QVERIFY(s1 == s2); } +void tst_QHeaderView::defaultSectionSizeTest() +{ + // Setup + QTableView qtv; + QStandardItemModel amodel(4, 4); + qtv.setModel(&amodel); + QHeaderView *hv = qtv.verticalHeader(); + const int defaultSize = 26; + hv->setDefaultSectionSize(defaultSize + 1); // Set it to a value different from defaultSize. + + // no hidden Sections + hv->resizeSection(1, 0); + hv->setDefaultSectionSize(defaultSize); + QVERIFY(hv->sectionSize(1) == defaultSize); + + // with hidden sections + hv->resizeSection(1, 0); + hv->hideSection(2); + hv->setDefaultSectionSize(defaultSize); + + QVERIFY(hv->sectionSize(0) == defaultSize); // trivial case. + QVERIFY(hv->sectionSize(1) == defaultSize); // just sized 0. Now it should be 10 + QVERIFY(hv->sectionSize(2) == 0); // section is hidden. It should not be resized. +} + + void tst_QHeaderView::defaultAlignment_data() { QTest::addColumn("direction"); -- cgit v1.2.3