diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-25 17:13:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-26 06:29:54 +0200 |
| commit | 414b91ab7f11efaf89afb237d682507caec05eff (patch) | |
| tree | 48ef40359136cd9f2e12cc1866dccd8c77aba590 /src/declarative | |
| parent | df5c836fe9753e81cda4a30fa27ce7af5e6f9a5f (diff) | |
Use visible only, and not opacity, in positioners
Task-number: QTBUG-12940
Change-Id: Id637bbd7c30aea8bc23c2aeaccfb069a8de7955f
Reviewed-on: http://codereview.qt.nokia.com/2082
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/items/qsgpositioners.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/items/qsgpositioners.cpp b/src/declarative/items/qsgpositioners.cpp index f5eab39384..3f6b24a8d4 100644 --- a/src/declarative/items/qsgpositioners.cpp +++ b/src/declarative/items/qsgpositioners.cpp @@ -57,7 +57,6 @@ static const QSGItemPrivate::ChangeTypes watchedChanges = QSGItemPrivate::Geometry | QSGItemPrivate::SiblingOrder | QSGItemPrivate::Visibility - | QSGItemPrivate::Opacity | QSGItemPrivate::Destroyed; void QSGBasePositionerPrivate::watchChanges(QSGItem *other) @@ -195,13 +194,13 @@ void QSGBasePositioner::prePositioning() positionedItems.append(posItem); item = &positionedItems[positionedItems.count()-1]; item->isNew = true; - if (child->opacity() <= 0.0 || !childPrivate->explicitVisible || !child->width() || !child->height()) + if (!childPrivate->explicitVisible || !child->width() || !child->height()) item->isVisible = false; } else { item = &oldItems[wIdx]; // Items are only omitted from positioning if they are explicitly hidden // i.e. their positioning is not affected if an ancestor is hidden. - if (child->opacity() <= 0.0 || !childPrivate->explicitVisible || !child->width() || !child->height()) { + if (!childPrivate->explicitVisible || !child->width() || !child->height()) { item->isVisible = false; } else if (!item->isVisible) { item->isVisible = true; |