status-im
/
status-qml
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(StatusChatListItem): This change fixes the issue of the chat list items getting a highlight even when they are not really hovered 

The issue is caused by the fact that the MouseArea returns containsMouse as true even when the item is not hovered.
The issue is reproduced when the model changes dynamically in the StatusChatList, thus causing the StatusChatListItem to be recreated and
this is when the containsMouse remains true even though the item is not hovered.
I see a bunch of issues in the QT bug list with regards to the containsMouse property but are still open.
A solution to this is to use HoverHandler which is a more reliable way getting hovered events for an item.
This commit is contained in:
Khushboo Mehta 2021-12-02 19:56:49 +01:00 committed by r4bbit.eth
parent 2336b6aab1
commit ab6bdf54c0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/StatusQ/Components/StatusChatListItem.qml
View File

@ -58,7 +58,7 @@ Rectangle {
if (selected) { if (selected) {
return Theme.palette.statusChatListItem.selectedBackgroundColor return Theme.palette.statusChatListItem.selectedBackgroundColor
} }
return sensor.containsMouse || highlighted ? Theme.palette.statusChatListItem.hoverBackgroundColor : Theme.palette.baseColor4 return hoverHander.hovered || highlighted ? Theme.palette.statusChatListItem.hoverBackgroundColor : Theme.palette.baseColor4
} }
opacity: dragged ? 0.7 : 1 opacity: dragged ? 0.7 : 1
@ -66,10 +66,13 @@ Rectangle {
MouseArea { MouseArea {
id: sensor id: sensor
HoverHandler {
id: hoverHander
}
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton acceptedButtons: Qt.LeftButton | Qt.RightButton
hoverEnabled: true
onClicked: statusChatListItem.clicked(mouse) onClicked: statusChatListItem.clicked(mouse)
@ -92,7 +95,7 @@ Rectangle {
width: 14 width: 14
visible: statusChatListItem.type !== StatusChatListItem.Type.OneToOneChat visible: statusChatListItem.type !== StatusChatListItem.Type.OneToOneChat
opacity: { opacity: {
if (statusChatListItem.muted && !sensor.containsMouse && !statusChatListItem.highlighted) { if (statusChatListItem.muted && !hoverHander.hovered && !statusChatListItem.highlighted) {
return 0.4 return 0.4
} }
return statusChatListItem.hasMention || return statusChatListItem.hasMention ||
@ -100,7 +103,7 @@ Rectangle {
statusChatListItem.selected || statusChatListItem.selected ||
statusChatListItem.highlighted || statusChatListItem.highlighted ||
statusBadge.visible || statusBadge.visible ||
sensor.containsMouse ? 1.0 : 0.7 hoverHander.hovered ? 1.0 : 0.7
} }
icon: { icon: {
@ -135,14 +138,14 @@ Rectangle {
statusChatListItem.name) statusChatListItem.name)
elide: Text.ElideRight elide: Text.ElideRight
color: { color: {
if (statusChatListItem.muted && !sensor.containsMouse && !statusChatListItem.highlighted) { if (statusChatListItem.muted && !hoverHander.hovered && !statusChatListItem.highlighted) {
return Theme.palette.directColor5 return Theme.palette.directColor5
} }
return statusChatListItem.hasMention || return statusChatListItem.hasMention ||
statusChatListItem.hasUnreadMessages || statusChatListItem.hasUnreadMessages ||
statusChatListItem.selected || statusChatListItem.selected ||
statusChatListItem.highlighted || statusChatListItem.highlighted ||
sensor.containsMouse || hoverHander.hovered ||
statusBadge.visible ? Theme.palette.directColor1 : Theme.palette.directColor4 statusBadge.visible ? Theme.palette.directColor1 : Theme.palette.directColor4
} }
font.weight: !statusChatListItem.muted && font.weight: !statusChatListItem.muted &&