1 files changed, 23 insertions, 26 deletions

diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 12faac8127..9bc6723cbd 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -709,9 +709,8 @@ void QQuickTableViewPrivate::syncLoadedTableRectFromLoadedTable()
 
 void QQuickTableViewPrivate::forceLayout()
 {
-    columnRowPositionsInvalid = true;
     clearEdgeSizeCache();
-    RebuildOptions rebuildOptions = RebuildOption::None;
+    RebuildOptions rebuildOptions = RebuildOption::LayoutOnly;
 
     // Go through all columns from first to last, find the columns that used
     // to be hidden and not loaded, and check if they should become visible
@@ -750,8 +749,7 @@ void QQuickTableViewPrivate::forceLayout()
         break;
     }
 
-    if (rebuildOptions)
-        scheduleRebuildTable(rebuildOptions);
+    scheduleRebuildTable(rebuildOptions);
 
     if (polishing) {
         qWarning() << "TableView::forceLayout(): Cannot do an immediate re-layout during an ongoing layout!";
@@ -1195,7 +1193,6 @@ void QQuickTableViewPrivate::relayoutTable()
 void QQuickTableViewPrivate::relayoutTableItems()
 {
     qCDebug(lcTableViewDelegateLifecycle);
-    columnRowPositionsInvalid = false;
 
     qreal nextColumnX = loadedTableOuterRect.x();
     qreal nextRowY = loadedTableOuterRect.y();
@@ -1465,7 +1462,13 @@ bool QQuickTableViewPrivate::moveToNextRebuildState()
         // that the current state is not yet done.
         return false;
     }
-    rebuildState = RebuildState(int(rebuildState) + 1);
+
+    if (rebuildState == RebuildState::Begin
+            && rebuildOptions.testFlag(RebuildOption::LayoutOnly))
+        rebuildState = RebuildState::LayoutTable;
+    else
+        rebuildState = RebuildState(int(rebuildState) + 1);
+
     qCDebug(lcTableViewDelegateLifecycle()) << int(rebuildState);
     return true;
 }
@@ -1527,7 +1530,6 @@ void QQuickTableViewPrivate::beginRebuildTable()
     loadedRows.clear();
     loadedTableOuterRect = QRect();
     loadedTableInnerRect = QRect();
-    columnRowPositionsInvalid = false;
     clearEdgeSizeCache();
 
     if (topLeft.x() == kEdgeIndexAtEnd || topLeft.y() == kEdgeIndexAtEnd) {
@@ -1541,12 +1543,14 @@ void QQuickTableViewPrivate::beginRebuildTable()
 
 void QQuickTableViewPrivate::layoutAfterLoadingInitialTable()
 {
-    if (rowHeightProvider.isUndefined() || columnWidthProvider.isUndefined()) {
+    if (rebuildOptions.testFlag(RebuildOption::LayoutOnly)
+            || rowHeightProvider.isUndefined() || columnWidthProvider.isUndefined()) {
         // Since we don't have both size providers, we need to calculate the
         // size of each row and column based on the size of the delegate items.
         // This couldn't be done while we were loading the initial rows and
         // columns, since during the process, we didn't have all the items
-        // available yet for the calculation. So we do it now.
+        // available yet for the calculation. So we do it now. The exception
+        // is if we specifically only requested a relayout.
         relayoutTable();
     }
 
@@ -1708,11 +1712,6 @@ void QQuickTableViewPrivate::scheduleRebuildTable(RebuildOptions options) {
     q_func()->polish();
 }
 
-void QQuickTableViewPrivate::invalidateColumnRowPositions() {
-    columnRowPositionsInvalid = true;
-    q_func()->polish();
-}
-
 void QQuickTableViewPrivate::updatePolish()
 {
     // Whenever something changes, e.g viewport moves, spacing is set to a
@@ -1745,13 +1744,6 @@ void QQuickTableViewPrivate::updatePolish()
     if (loadedItems.isEmpty())
         return;
 
-    if (columnRowPositionsInvalid) {
-        relayoutTable();
-        updateAverageEdgeSize();
-        updateContentWidth();
-        updateContentHeight();
-    }
-
     loadAndUnloadVisibleEdges();
 }
 
@@ -1856,10 +1848,15 @@ void QQuickTableViewPrivate::syncRebuildOptions()
     rebuildOptions = scheduledRebuildOptions;
     scheduledRebuildOptions = RebuildOption::None;
 
-    if (loadedItems.isEmpty()) {
-        // If we have no items from before, we cannot just rebuild the viewport, but need
-        // to rebuild everything, since we have no top-left loaded item to start from.
+    if (loadedItems.isEmpty())
         rebuildOptions.setFlag(RebuildOption::All);
+
+    // Some options are exclusive:
+    if (rebuildOptions.testFlag(RebuildOption::All)) {
+        rebuildOptions.setFlag(RebuildOption::ViewportOnly, false);
+        rebuildOptions.setFlag(RebuildOption::LayoutOnly, false);
+    } else if (rebuildOptions.testFlag(RebuildOption::ViewportOnly)) {
+        rebuildOptions.setFlag(RebuildOption::LayoutOnly, false);
     }
 }
 
@@ -2073,7 +2070,7 @@ void QQuickTableView::setRowSpacing(qreal spacing)
         return;
 
     d->cellSpacing.setHeight(spacing);
-    d->invalidateColumnRowPositions();
+    d->scheduleRebuildTable(QQuickTableViewPrivate::RebuildOption::LayoutOnly);
     emit rowSpacingChanged();
 }
 
@@ -2091,7 +2088,7 @@ void QQuickTableView::setColumnSpacing(qreal spacing)
         return;
 
     d->cellSpacing.setWidth(spacing);
-    d->invalidateColumnRowPositions();
+    d->scheduleRebuildTable(QQuickTableViewPrivate::RebuildOption::LayoutOnly);
     emit columnSpacingChanged();
 }