From 0d1f29c6e026a6656430aa601ebc25459015d53e Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 15 Feb 2012 16:27:36 +1000 Subject: Ensure visibility changes are communicated through itemChange. Also added MouseArea test that depends on this functionality. Change-Id: I1c303504ffd63d6b9dbdf95ab63e8426dc09c02d Reviewed-by: Andrew den Exter --- src/quick/items/qquickitem.cpp | 6 +----- src/quick/items/qquickitem.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 67da4c8fc8..c5d55cf6b3 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -4009,11 +4009,7 @@ bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible) for (int ii = 0; ii < childItems.count(); ++ii) childVisibilityChanged |= QQuickItemPrivate::get(childItems.at(ii))->setEffectiveVisibleRecur(newEffectiveVisible); - for (int ii = 0; ii < changeListeners.count(); ++ii) { - const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii); - if (change.types & QQuickItemPrivate::Visibility) - change.listener->itemVisibilityChanged(q); - } + itemChange(QQuickItem::ItemVisibleHasChanged, effectiveVisible); if (isAccessible) QAccessible::updateAccessibility(QAccessibleEvent(effectiveVisible ? QAccessible::ObjectShow : QAccessible::ObjectHide, q, 0)); diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 91771c809b..16a6074354 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -168,7 +168,7 @@ public: ItemChildAddedChange, // value.item ItemChildRemovedChange, // value.item ItemSceneChange, // value.canvas - ItemVisibleHasChanged, // value.realValue + ItemVisibleHasChanged, // value.boolValue ItemParentHasChanged, // value.item ItemOpacityHasChanged, // value.realValue ItemActiveFocusHasChanged, // value.boolValue -- cgit v1.2.3