diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-12-06 21:03:54 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-12-09 18:46:19 +0100 |
| commit | 9608e996a237d9a69a3e29f533e4f430cf9016c1 (patch) | |
| tree | dca1966c4df172cb69758d0c2964e31b491eda98 /src/widgets | |
| parent | 4c3c63d4cbb81b38e88e06b72749e7e01497b6f1 (diff) | |
QAIV::sizeHintForIndex: return correct size when no delegate is set
QAIV::sizeHintForIndex checks if a delegate is set for this view but
does not check if there are row/column delegates which may be
appropriate for this task.
Fix it by retrieving the correct delegate directly with
delegateForIndex().
Change-Id: I264359b12e1983aab3a917db7dbcab11253a448f
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 67c01adea7..bb219393f3 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -3074,9 +3074,10 @@ void QAbstractItemView::keyboardSearch(const QString &search) QSize QAbstractItemView::sizeHintForIndex(const QModelIndex &index) const { Q_D(const QAbstractItemView); - if (!d->isIndexValid(index) || !d->itemDelegate) + if (!d->isIndexValid(index)) return QSize(); - return d->delegateForIndex(index)->sizeHint(d->viewOptionsV1(), index); + const auto delegate = d->delegateForIndex(index); + return delegate ? delegate->sizeHint(d->viewOptionsV1(), index) : QSize(); } /*! |