Fixed a bug where spans did not always work in layouts.

The problem was that the span we stored in the multiCellMap was the "effective" span (i.e. the given span subtracted with the number of ignored rows it would span). Later we used that span to distribute its size across all its cells. However, since the span now could be smaller that the given span, we could sometimes fail to distribute to the last span(s). [ChangeLog][QtWidgets][layouts] Fixed a bug where spans sometimes didn't distribute themselves to the last cells they covered. Change-Id: I31db3d850484dc8b70d62c5f02f680740578c661 Task-number: QTBUG-43099 Reviewed-by: Paul Olav Tvete <[email protected]>
brad0 · Dec 9, 2014 · c9db6e5 · c9db6e5
1 parent 68d5286
commit c9db6e5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp
@@ -1367,7 +1367,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData,
                             rowStretch = qMax(rowStretch, itemStretch);
                     } else {
                         QGridLayoutMultiCellData &multiCell =
-                                rowData->multiCellMap[qMakePair(row, effectiveRowSpan)];
+                                rowData->multiCellMap[qMakePair(row, itemRowSpan)];
                         box = &multiCell.q_box;
                         multiCell.q_stretch = itemStretch;
                     }

diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -1682,6 +1682,23 @@ void tst_QGraphicsGridLayout::sizeHint_data()
                             << QSizeF(100, 100)
                             << QSizeF(100, 100);
 
+    QTest::newRow("colSpan_with_ignored_column") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(40,20))
+                                        .maxSize(QSizeF(60,20))
+                                        .colSpan(2)
+                                    << ItemDesc(0,2)
+                                        .minSize(QSizeF(20, 20))
+                                        .maxSize(QSizeF(30, 20))
+                                    << ItemDesc(1,0)
+                                        .minSize(QSizeF(60, 20))
+                                        .maxSize(QSizeF(90, 20))
+                                        .colSpan(3)
+                                )
+                            << QSizeF(60, 40)
+                            << QSizeF(80, 40)
+                            << QSizeF(90, 40);
+
 }
 
 // public QSizeF sizeHint(Qt::SizeHint which, QSizeF const& constraint = QSizeF()) const