diff options
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp | 44 |
2 files changed, 48 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 16de80476f..71404c9792 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -891,6 +891,7 @@ void QAbstractItemView::setItemDelegateForRow(int row, QAbstractItemDelegate *de disconnect(rowDelegate, SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)), this, SLOT(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint))); disconnect(rowDelegate, SIGNAL(commitData(QWidget*)), this, SLOT(commitData(QWidget*))); + disconnect(rowDelegate, SIGNAL(sizeHintChanged(QModelIndex)), this, SLOT(doItemsLayout())); } d->rowDelegates.remove(row); } @@ -899,10 +900,12 @@ void QAbstractItemView::setItemDelegateForRow(int row, QAbstractItemDelegate *de connect(delegate, SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)), this, SLOT(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint))); connect(delegate, SIGNAL(commitData(QWidget*)), this, SLOT(commitData(QWidget*))); + connect(delegate, SIGNAL(sizeHintChanged(QModelIndex)), this, SLOT(doItemsLayout()), Qt::QueuedConnection); } d->rowDelegates.insert(row, delegate); } viewport()->update(); + d->doDelayedItemsLayout(); } /*! @@ -948,6 +951,7 @@ void QAbstractItemView::setItemDelegateForColumn(int column, QAbstractItemDelega disconnect(columnDelegate, SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)), this, SLOT(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint))); disconnect(columnDelegate, SIGNAL(commitData(QWidget*)), this, SLOT(commitData(QWidget*))); + disconnect(columnDelegate, SIGNAL(sizeHintChanged(QModelIndex)), this, SLOT(doItemsLayout())); } d->columnDelegates.remove(column); } @@ -956,10 +960,12 @@ void QAbstractItemView::setItemDelegateForColumn(int column, QAbstractItemDelega connect(delegate, SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)), this, SLOT(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint))); connect(delegate, SIGNAL(commitData(QWidget*)), this, SLOT(commitData(QWidget*))); + connect(delegate, SIGNAL(sizeHintChanged(QModelIndex)), this, SLOT(doItemsLayout()), Qt::QueuedConnection); } d->columnDelegates.insert(column, delegate); } viewport()->update(); + d->doDelayedItemsLayout(); } /*! diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 3f8b8ec067..ff910ba359 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -180,6 +180,16 @@ public: { doAutoScroll(); } }; +class GeometriesTestView : public QTableView +{ + Q_OBJECT +public: + GeometriesTestView() : QTableView(), updateGeometriesCalled(false) {} + bool updateGeometriesCalled; +protected slots: + void updateGeometries() Q_DECL_OVERRIDE { updateGeometriesCalled = true; QTableView::updateGeometries(); } +}; + class tst_QAbstractItemView : public QObject { Q_OBJECT @@ -241,6 +251,7 @@ private slots: void testFocusPolicy(); void QTBUG31411_noSelection(); void QTBUG39324_settingSameInstanceOfIndexWidget(); + void sizeHintChangeTriggersLayout(); }; class MyAbstractItemDelegate : public QAbstractItemDelegate @@ -248,7 +259,7 @@ class MyAbstractItemDelegate : public QAbstractItemDelegate public: MyAbstractItemDelegate() : QAbstractItemDelegate() { calledVirtualDtor = false; } void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const {} - QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { return QSize(); } + QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const { return size; } QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &) const { openedEditor = new QWidget(parent); @@ -259,9 +270,10 @@ public: calledVirtualDtor = true; editor->deleteLater(); } - + void changeSize() { size = QSize(50, 50); emit sizeHintChanged(QModelIndex()); } mutable bool calledVirtualDtor; mutable QWidget *openedEditor; + QSize size; }; // Testing get/set functions @@ -725,6 +737,34 @@ void tst_QAbstractItemView::columnDelegate() QCOMPARE(w->metaObject()->className(), "QWidget"); } +void tst_QAbstractItemView::sizeHintChangeTriggersLayout() +{ + QStandardItemModel model(4, 4); + MyAbstractItemDelegate delegate; + MyAbstractItemDelegate rowDelegate; + MyAbstractItemDelegate columnDelegate; + + GeometriesTestView view; + view.setModel(&model); + view.setItemDelegate(&delegate); + view.setItemDelegateForRow(1, &rowDelegate); + view.setItemDelegateForColumn(2, &columnDelegate); + view.show(); + QVERIFY(QTest::qWaitForWindowExposed(&view)); + view.updateGeometriesCalled = false; + delegate.changeSize(); + QCoreApplication::sendPostedEvents(); + QVERIFY(view.updateGeometriesCalled); + view.updateGeometriesCalled = false; + rowDelegate.changeSize(); + QCoreApplication::sendPostedEvents(); + QVERIFY(view.updateGeometriesCalled); + view.updateGeometriesCalled = false; + columnDelegate.changeSize(); + QCoreApplication::sendPostedEvents(); + QVERIFY(view.updateGeometriesCalled); +} + void tst_QAbstractItemView::selectAll() { QStandardItemModel model(4,4); |