diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2013-06-05 13:48:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-06 12:00:09 +0200 |
| commit | 05e492cf7ab30286087f579cefd9829da569f48f (patch) | |
| tree | c36150dba34f3aeb953150d3cf3e6b9dd2c1dec0 /src | |
| parent | 6694cbabbf905ede781f430d6ec7587c79f94de9 (diff) | |
Fixed a bug where a rearrange was not always done
This happened only when the size of the layout didn't change.
Task-number: QTBUG-31570
Change-Id: Ia090c0062fa8fc3eb6f648592529ee8fcd025593
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/layouts/qquickgridlayoutengine_p.h | 10 | ||||
| -rw-r--r-- | src/layouts/qquicklayout_p.h | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/layouts/qquickgridlayoutengine_p.h b/src/layouts/qquickgridlayoutengine_p.h index 29317ffbb..8842d36a7 100644 --- a/src/layouts/qquickgridlayoutengine_p.h +++ b/src/layouts/qquickgridlayoutengine_p.h @@ -112,8 +112,16 @@ public: void setGeometry(const QRectF &rect) { const QRect r(rect.toRect()); + const QSize newSize(r.size()); m_item->setPosition(r.topLeft()); - m_item->setSize(r.size()); + QSizeF oldSize(m_item->width(), m_item->height()); + if (newSize == oldSize) { + if (QQuickLayout *lay = qobject_cast<QQuickLayout *>(m_item)) + if (lay->arrangementIsDirty()) + lay->rearrange(newSize); + } else { + m_item->setSize(newSize); + } } QQuickItem *layoutItem() const { return m_item; } diff --git a/src/layouts/qquicklayout_p.h b/src/layouts/qquicklayout_p.h index 0239739a6..76c197173 100644 --- a/src/layouts/qquicklayout_p.h +++ b/src/layouts/qquicklayout_p.h @@ -77,9 +77,10 @@ public: void componentComplete(); virtual QSizeF sizeHint(Qt::SizeHint whichSizeHint) const = 0; virtual void invalidate(QQuickItem * childItem = 0); + virtual void rearrange(const QSizeF &); + bool arrangementIsDirty() const { return m_dirty; } protected: bool event(QEvent *e); - virtual void rearrange(const QSizeF &); enum Orientation { Vertical = 0, |