aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickpopup.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-08 09:53:26 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-09 10:39:23 +0000
commit81e60ab430321d61196a9e044d8aeb89105a4565 (patch)
treec99b79bb807dda87497665e8a1dc42dee394f74f /src/templates/qquickpopup.cpp
parentaac160ea2911015b03e3304ec496835b79f2e4fc (diff)
Add QQuickPopup::itemChange()
QQuickToolTip wants to hide itself after a configurable timeout. It can override this method and catch ItemVisibleHasChanged in order to implement the timeout functionality. Change-Id: I0ec1593e8c36bf5635507ab65f338901035d5055 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickpopup.cpp')
-rw-r--r--src/templates/qquickpopup.cpp27
1 files changed, 17 insertions, 10 deletions
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp
index ff58ab83..6fa13475 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/templates/qquickpopup.cpp
@@ -398,16 +398,7 @@ void QQuickPopupItem::itemChange(ItemChange change, const ItemChangeData &data)
{
Q_D(QQuickPopupItem);
QQuickControl::itemChange(change, data);
- switch (change) {
- case ItemActiveFocusHasChanged:
- emit d->popup->activeFocusChanged();
- break;
- case ItemOpacityHasChanged:
- emit d->popup->opacityChanged();
- break;
- default:
- break;
- }
+ d->popup->itemChange(change, data);
}
void QQuickPopupItem::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding)
@@ -1658,6 +1649,22 @@ void QQuickPopup::geometryChanged(const QRectF &newGeometry, const QRectF &oldGe
}
}
+void QQuickPopup::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
+{
+ Q_UNUSED(data);
+
+ switch (change) {
+ case QQuickItem::ItemActiveFocusHasChanged:
+ emit activeFocusChanged();
+ break;
+ case QQuickItem::ItemOpacityHasChanged:
+ emit opacityChanged();
+ break;
+ default:
+ break;
+ }
+}
+
void QQuickPopup::marginsChange(const QMarginsF &newMargins, const QMarginsF &oldMargins)
{
Q_D(QQuickPopup);