From 9c5d31834143fa5e10e4ea2c3c78a0ea63c3bbda Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 15 Nov 2018 10:15:30 +1300
Subject: [PATCH] Fix highlighting
---
interface/resources/qml/hifi/Card.qml | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml
index d7fafcc165..5c89a07b08 100644
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@@ -244,13 +244,9 @@ Item {
z: 1
}
MouseArea {
- anchors.fill: parent;
- acceptedButtons: Qt.LeftButton;
- onClicked: {
- Tablet.playSound(TabletEnums.ButtonClick);
- goFunction("hifi://" + hifiUrl);
- }
- hoverEnabled: true;
+ anchors.fill: parent
+ acceptedButtons: Qt.LeftButton
+ hoverEnabled: true
onContainsMouseChanged: {
// Use onContainsMouseChanged rather than onEntered and onExited because the latter aren't always
// triggered correctly - e.g., if drag rightwards from right hand side of a card to the next card
@@ -263,6 +259,17 @@ Item {
}
}
}
+ MouseArea {
+ // Separate MouseArea for click handling so that it doesn't interfere with hovering and interaction
+ // with containing ListView.
+ anchors.fill: parent
+ acceptedButtons: Qt.LeftButton
+ hoverEnabled: false
+ onClicked: {
+ Tablet.playSound(TabletEnums.ButtonClick);
+ goFunction("hifi://" + hifiUrl);
+ }
+ }
StateImage {
id: actionIcon;
visible: !isAnnouncement;