diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-05 13:17:05 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-05 13:33:50 (GMT) |
| commit | 43a9da5339b38ca2b4e507efe2d4fa72df6b2ff3 (patch) | |
| tree | 3cb3e6e2484c1e8af2a48ee2a904d9a756ca8360 /src/gui/graphicsview | |
| parent | 82a35ed3f1dede556e9ab6e30b86997c4a8f0fd1 (diff) | |
| download | Qt-43a9da5339b38ca2b4e507efe2d4fa72df6b2ff3.zip Qt-43a9da5339b38ca2b4e507efe2d4fa72df6b2ff3.tar.gz Qt-43a9da5339b38ca2b4e507efe2d4fa72df6b2ff3.tar.bz2 | |
Fixed a bug with distribution of spans.
If a span required more size than the rows/columns it spanned, the
size of the span was not distributed to the rows it spanned. The
result was that the size hints of the layout was not correct,
causing the layout to be potentially smaller than the spanning item.
Task: QT-2261
Reviewed-by: Alexis
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgridlayoutengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index 9497a2f..1fece7a 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -182,9 +182,9 @@ void QGridLayoutRowData::distributeMultiCells() QVarLengthArray<qreal> newSizes(span); for (int j = 0; j < NSizes; ++j) { - qreal extra = compare(totalBox, box, j); + qreal extra = compare(box, totalBox, j); if (extra > 0.0) { - calculateGeometries(start, end, totalBox.q_sizes(j), dummy.data(), newSizes.data(), + calculateGeometries(start, end, box.q_sizes(j), dummy.data(), newSizes.data(), 0, totalBox); for (int k = 0; k < span; ++k) |