Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 07:17:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12326 from zfox23/commerce_fixPopUpHover

Browse source 
Fix a bug where hover events incorrectly propagate under popups
This commit is contained in:
Zach Fox 2018-02-02 13:23:36 -08:00 committed by GitHub
commit 28c9cd15a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -571,6 +571,7 @@ Rectangle {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
RalewayBold { RalewayBold {

1
interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
View file

@ -45,6 +45,7 @@ Rectangle {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
Rectangle { Rectangle {

1
interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
View file

@ -44,6 +44,7 @@ Rectangle {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
Item { Item {

1
interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
View file

@ -119,6 +119,7 @@ Rectangle {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
Image { Image {

1
interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
View file

@ -316,6 +316,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
RalewayBold { RalewayBold {

1
interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
View file

@ -66,6 +66,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
// This will cause a bug -- if you bring up passphrase selection in HUD mode while // This will cause a bug -- if you bring up passphrase selection in HUD mode while

1
interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
View file

@ -34,6 +34,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
Connections { Connections {

1
interface/resources/qml/hifi/commerce/wallet/Security.qml
View file

@ -306,6 +306,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
RalewayBold { RalewayBold {

1
interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
View file

@ -394,6 +394,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
Image { Image {

5
interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
View file

@ -43,6 +43,7 @@ Item {
width: parent.width; width: parent.width;
height: (root.shouldShowTopAndBottomOfWallet || root.shouldShowTopOfWallet) ? parent.height : parent.height - root.parentAppTitleBarHeight - root.parentAppNavBarHeight; height: (root.shouldShowTopAndBottomOfWallet || root.shouldShowTopOfWallet) ? parent.height : parent.height - root.parentAppTitleBarHeight - root.parentAppNavBarHeight;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
Connections { Connections {
@ -326,6 +327,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
ListModel { ListModel {
@ -477,6 +479,7 @@ Item {
enabled: connectionsList.currentIndex !== index; enabled: connectionsList.currentIndex !== index;
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
onClicked: { onClicked: {
connectionsList.currentIndex = index; connectionsList.currentIndex = index;
} }
@ -505,6 +508,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
Rectangle { Rectangle {
@ -1059,6 +1063,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
propagateComposedEvents: false; propagateComposedEvents: false;
hoverEnabled: true;
} }
AnimatedImage { AnimatedImage {