status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix button alignment and background glitch in compact mode

This commit is contained in:
Jonathan Rainville 2021-02-01 14:05:34 -05:00 committed by Iuri Matias
parent 8a43fffd77
commit c665861820
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
View File

@ -31,7 +31,6 @@ ScrollView {
ListView { ListView {
property string currentNotificationChatId property string currentNotificationChatId
property bool chatButtonsHovered: false
id: chatLogView id: chatLogView
anchors.fill: parent anchors.fill: parent

4
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatButtons.qml
View File

@ -38,11 +38,9 @@ Rectangle {
hoverEnabled: true hoverEnabled: true
onEntered: { onEntered: {
buttonsContainer.hoverChanged(true) buttonsContainer.hoverChanged(true)
chatLogView.chatButtonsHovered = true
} }
onExited: { onExited: {
buttonsContainer.hoverChanged(false) buttonsContainer.hoverChanged(false)
chatLogView.chatButtonsHovered = false
} }
} }
@ -64,7 +62,6 @@ Rectangle {
clickMessage(false, false, false, null, true) clickMessage(false, false, false, null, true)
} }
onHoveredChanged: { onHoveredChanged: {
chatLogView.chatButtonsHovered = this.hovered
buttonsContainer.hoverChanged(this.hovered) buttonsContainer.hoverChanged(this.hovered)
} }
@ -85,7 +82,6 @@ Rectangle {
showReplyArea() showReplyArea()
} }
onHoveredChanged: { onHoveredChanged: {
chatLogView.chatButtonsHovered = this.hovered
buttonsContainer.hoverChanged(this.hovered) buttonsContainer.hoverChanged(this.hovered)
} }

6
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
View File

@ -32,7 +32,7 @@ Item {
onHoverChanged: root.isHovered = hovered onHoverChanged: root.isHovered = hovered
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 anchors.rightMargin: 20
anchors.top: parent.top anchors.top: messageContainer.top
// This is not exactly like the design because the hover becomes messed up with the buttons on top of another Message // This is not exactly like the design because the hover becomes messed up with the buttons on top of another Message
anchors.topMargin: -Style.current.halfPadding anchors.topMargin: -Style.current.halfPadding
} }
@ -68,7 +68,6 @@ Item {
(hasMention ? Style.current.mentionMessageColor : Style.current.transparent) (hasMention ? Style.current.mentionMessageColor : Style.current.transparent)
UserImage { UserImage {
id: chatImage id: chatImage
anchors.left: parent.left anchors.left: parent.left
@ -243,9 +242,6 @@ Item {
root.isHovered = true root.isHovered = true
} }
onExited: { onExited: {
if (chatLogView.chatButtonsHovered) {
return
}
root.isHovered = false root.isHovered = false
} }
} }

1
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml
View File

@ -9,6 +9,7 @@ MouseArea {
onClicked: { onClicked: {
if(mouse.button & Qt.RightButton) { if(mouse.button & Qt.RightButton) {
clickMessage(false, isSticker, false); clickMessage(false, isSticker, false);
isMessageActive = true
return; return;
} }
if (mouse.button & Qt.LeftButton) { if (mouse.button & Qt.LeftButton) {