whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <paul.tvete@theqtcompany.com>
bb10
Jan Arve Saether 2014-12-09 13:26:18 +01:00 committed by Jan Arve Sæther
parent 68d528654f
commit c9db6e52bc
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/util/qgridlayoutengine.cpp
View File

@ -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;
}

17
tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
View File

@ -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