diff options
| author | Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> | 2023-05-29 21:31:29 +0200 |
|---|---|---|
| committer | Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> | 2023-05-30 13:42:35 +0200 |
| commit | 79e46dd07c3b23f93caced2f443939e34ef515bc (patch) | |
| tree | 898258eae9386210d12477a0734a9d1b54e072e0 /src | |
| parent | cdd7fe05f676ed1664a156beaf63093237a3beac (diff) | |
Fix delegate loading issue when valid size is specified
The patchset ebefb583c886dba86aa51012fb377762235f2379 is made to avoid
loading delegate when view port size is zero. But this affects the
scenario when any of its size is valid in delegates.
This patchset fixes delegate loading issue when valid size is specified
in it.
Fixes: QTBUG-113852
Pick-to: 6.5
Change-Id: Ib8b527175b91fefb8062f7ea5abc0c9b7860a0e7
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquicktableview.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp index a20c59e088..863d5100bb 100644 --- a/src/quick/items/qquicktableview.cpp +++ b/src/quick/items/qquicktableview.cpp @@ -2072,7 +2072,10 @@ void QQuickTableViewPrivate::updateContentWidth() if (loadedItems.isEmpty()) { QBoolBlocker fixupGuard(inUpdateContentSize, true); - q->QQuickFlickable::setContentWidth(0); + if (model && model->count() > 0 && tableModel && tableModel->delegate()) + q->QQuickFlickable::setContentWidth(kDefaultColumnWidth); + else + q->QQuickFlickable::setContentWidth(0); return; } @@ -2105,7 +2108,10 @@ void QQuickTableViewPrivate::updateContentHeight() if (loadedItems.isEmpty()) { QBoolBlocker fixupGuard(inUpdateContentSize, true); - q->QQuickFlickable::setContentHeight(0); + if (model && model->count() > 0 && tableModel && tableModel->delegate()) + q->QQuickFlickable::setContentHeight(kDefaultRowHeight); + else + q->QQuickFlickable::setContentHeight(0); return; } |