From 19235b8d946f539f4e4fe36d9f71c8683a17e339 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 2 Feb 2018 10:50:35 -0800 Subject: [PATCH] Fix a bug where hover events incorrectly propagate under popups --- interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 1 + .../resources/qml/hifi/commerce/common/CommerceLightbox.qml | 1 + .../resources/qml/hifi/commerce/common/FirstUseTutorial.qml | 1 + .../commerce/inspectionCertificate/InspectionCertificate.qml | 1 + .../resources/qml/hifi/commerce/purchases/PurchasedItem.qml | 1 + .../resources/qml/hifi/commerce/wallet/PassphraseModal.qml | 1 + .../qml/hifi/commerce/wallet/PassphraseSelection.qml | 1 + interface/resources/qml/hifi/commerce/wallet/Security.qml | 1 + interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml | 1 + .../qml/hifi/commerce/wallet/sendMoney/SendMoney.qml | 5 +++++ 10 files changed, 14 insertions(+) diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml index 4de09c1bf3..809f48361d 100644 --- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml @@ -571,6 +571,7 @@ Rectangle { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } RalewayBold { diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml index 145b78bdc4..8b0ec17232 100644 --- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml +++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml @@ -45,6 +45,7 @@ Rectangle { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } Rectangle { diff --git a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml index 0d3f67ef7a..bcc641acd5 100644 --- a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml +++ b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml @@ -44,6 +44,7 @@ Rectangle { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } Item { diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml index c331532f5e..421fa4b074 100644 --- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml +++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml @@ -119,6 +119,7 @@ Rectangle { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } Image { diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml index f7913e5b1e..05e280b839 100644 --- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml +++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml @@ -316,6 +316,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } RalewayBold { diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml index 87430246f3..c586af9e80 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml @@ -66,6 +66,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } // This will cause a bug -- if you bring up passphrase selection in HUD mode while diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml index 50e58f8cc4..50bea2a3cf 100644 --- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml +++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml @@ -34,6 +34,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } Connections { diff --git a/interface/resources/qml/hifi/commerce/wallet/Security.qml b/interface/resources/qml/hifi/commerce/wallet/Security.qml index 634a68d117..224b743c06 100644 --- a/interface/resources/qml/hifi/commerce/wallet/Security.qml +++ b/interface/resources/qml/hifi/commerce/wallet/Security.qml @@ -306,6 +306,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } RalewayBold { diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml index fd74b07465..fab27a29bb 100644 --- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml +++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml @@ -394,6 +394,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } Image { diff --git a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml index f66781c919..24b6c6b9a1 100644 --- a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml +++ b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml @@ -43,6 +43,7 @@ Item { width: parent.width; height: (root.shouldShowTopAndBottomOfWallet || root.shouldShowTopOfWallet) ? parent.height : parent.height - root.parentAppTitleBarHeight - root.parentAppNavBarHeight; propagateComposedEvents: false; + hoverEnabled: true; } Connections { @@ -326,6 +327,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } ListModel { @@ -477,6 +479,7 @@ Item { enabled: connectionsList.currentIndex !== index; anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; onClicked: { connectionsList.currentIndex = index; } @@ -505,6 +508,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } Rectangle { @@ -1059,6 +1063,7 @@ Item { MouseArea { anchors.fill: parent; propagateComposedEvents: false; + hoverEnabled: true; } AnimatedImage {