aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickpositioners.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@jollamobile.com>2014-05-03 10:06:09 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-08 07:18:53 +0200
commitda15ea0f3b5805db657f13060c21efa78f10cde2 (patch)
treecba6670f3a27dd44cb10734d8ed5a35c33133453 /src/quick/items/qquickpositioners.cpp
parent9dc408e4bdeca5f4724dab65ac49691a49ff93b1 (diff)
Make item.layer and item.layer.effect work inside positioners.
Task-number: QTBUG-31269 Change-Id: Ic3bb76ea5a5055df614f2eaacd3031445f118ca7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/quick/items/qquickpositioners.cpp')
-rw-r--r--src/quick/items/qquickpositioners.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index 0ef871be43..6236f0047b 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -305,6 +305,8 @@ void QQuickBasePositioner::prePositioning()
for (int ii = 0; ii < children.count(); ++ii) {
QQuickItem *child = children.at(ii);
+ if (QQuickItemPrivate::get(child)->isTransparentForPositioner())
+ continue;
QQuickItemPrivate *childPrivate = QQuickItemPrivate::get(child);
PositionedItem posItem(child);
int wIdx = oldItems.find(posItem);
@@ -1038,7 +1040,7 @@ void QQuickRow::reportConflictingAnchors()
\image gridLayout_example.png
- If an item within a Column is not \l {Item::}{visible}, or if it has a width or
+ If an item within a Grid is not \l {Item::}{visible}, or if it has a width or
height of 0, the item will not be laid out and it will not be visible within the
column. Also, since a Grid automatically positions its children, a child
item within a Grid should not set its \l {Item::x}{x} or \l {Item::y}{y} positions