diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2013-04-05 10:32:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 13:40:03 +0200 |
| commit | 2dd9ce1cf6549565b0f57d6663798bd25412506c (patch) | |
| tree | 5d4a592f93227e981684189df7af1892fb7de86b /src | |
| parent | 055b4a73e2b0c8d26a7581085885fe3b8b1b2219 (diff) | |
Fixed a bug where the MaximumSizeHint of a layout with spans was wrong
This was spotted while tracking down a similar bug related to spans.
The problem was only for the maximum size, since the size of an ignored
row/column was min: 0, pref: 0, max: FLT_MAX (the default constructed
values for a QGridLayoutBox).
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
(cherry picked from qtbase/9d7ae6dfbe25fb70a362a4cf955c187cd24cb007)
Change-Id: Ic0f3cf12639fbb6ab85c4946d9e8cc1d8d68e753
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/layouts/qgridlayoutengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/layouts/qgridlayoutengine.cpp b/src/layouts/qgridlayoutengine.cpp index f72bffe26..d091d124e 100644 --- a/src/layouts/qgridlayoutengine.cpp +++ b/src/layouts/qgridlayoutengine.cpp @@ -432,6 +432,8 @@ QGridLayoutBox QGridLayoutRowData::totalBox(int start, int end) const result.q_maximumSize = 0.0; qreal nextSpacing = 0.0; for (int i = start; i < end; ++i) { + if (ignore.testBit(i)) + continue; result.add(boxes.at(i), stretches.at(i), nextSpacing); nextSpacing = spacings.at(i); } |