diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-29 02:39:30 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-29 03:10:19 (GMT) |
| commit | f54353bf2f566335e44d20b5263fe19d5ac33d1e (patch) | |
| tree | 5470e997ef138b2d0a6562ef4f24cb2f747fcc41 /src/declarative/graphicsitems/qdeclarativepositioners.cpp | |
| parent | b1b46d4e5bd9e4ef355d8bbc13900d7489fb4bf9 (diff) | |
| download | Qt-f54353bf2f566335e44d20b5263fe19d5ac33d1e.zip Qt-f54353bf2f566335e44d20b5263fe19d5ac33d1e.tar.gz Qt-f54353bf2f566335e44d20b5263fe19d5ac33d1e.tar.bz2 | |
Fix flow layout not taking into account whether it's width and height are implicit or not.
Task-number: QTBUG-11778
Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepositioners.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepositioners.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index b9231a1..179f13d 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -1027,13 +1027,13 @@ void QDeclarativeFlow::doPositioning(QSizeF *contentSize) continue; if (d->flow == LeftToRight) { - if (hoffset && hoffset + child.item->width() > width()) { + if (widthValid() && hoffset && hoffset + child.item->width() > width()) { hoffset = 0; voffset += linemax + spacing(); linemax = 0; } } else { - if (voffset && voffset + child.item->height() > height()) { + if (heightValid() && voffset && voffset + child.item->height() > height()) { voffset = 0; hoffset += linemax + spacing(); linemax = 0; |