From 188f487695653606c767b6a2a0e378375651278a Mon Sep 17 00:00:00 2001
From: Andreas Hatziiliou <andreas.hatziiliou@savoirfairelinux.com>
Date: Wed, 23 Oct 2024 11:30:47 -0400
Subject: [PATCH] chatview: change visibility of reply component
Make it so that the reply/more/share buttons are visible
whenever the cursor hovers over the horizontal area
that a message takes up. Add message highlighting.
Fix small issue with "more" button not being deselected
after choosing an emoji
GitLab: #1870
Change-Id: I4db5230c2a50ce4640eececc69f8e88348356d79
---
src/app/commoncomponents/SBSMessageBase.qml | 20 +++++++++++---------
src/app/commoncomponents/ShowMoreMenu.qml | 9 +++++++--
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml
index 15d7eeeba..6e49daea2 100644
--- a/src/app/commoncomponents/SBSMessageBase.qml
+++ b/src/app/commoncomponents/SBSMessageBase.qml
@@ -230,6 +230,12 @@ Control {
RowLayout {
id: msgRowlayout
+ HoverHandler {
+ id: parenthandler
+ }
+
+ property bool msgHovered: CurrentAccount.type !== Profile.Type.SIP && root.type !== Interaction.Type.CALL && Body !== "" && (bubbleArea.bubbleHovered || hovered || more.hovered || share.hovered || parenthandler.hovered)
+
Layout.preferredHeight: {
var h = innerContent.height + root.extraHeight;
if (emojiReactions.emojis !== "")
@@ -282,10 +288,6 @@ Control {
height: JamiTheme.emojiPushButtonSize
anchors.verticalCenter: bubble.verticalCenter
- HoverHandler {
- id: bgHandler
- }
-
PushButton {
id: more
objectName: "more"
@@ -299,7 +301,7 @@ Control {
anchors.verticalCenter: parent.verticalCenter
anchors.right: isOutgoing ? optionButtonItem.right : undefined
anchors.left: !isOutgoing ? optionButtonItem.left : undefined
- visible: CurrentAccount.type !== Profile.Type.SIP && root.type !== Interaction.Type.CALL && Body !== "" && (bubbleArea.bubbleHovered || hovered || reply.hovered || share.hovered || bgHandler.hovered)
+ visible: msgRowlayout.msgHovered
source: JamiResources.more_vert_24dp_svg
width: optionButtonItem.width / 4
height: optionButtonItem.height
@@ -309,7 +311,7 @@ Control {
function setBindings() {
more.isOpen = false;
- visible = Qt.binding(() => CurrentAccount.type !== Profile.Type.SIP && root.type !== Interaction.Type.CALL && Body !== "" && (bubbleArea.bubbleHovered || hovered || reply.hovered || share.hovered || bgHandler.hovered));
+ visible = Qt.binding(() => msgRowlayout.msgHovered);
imageColor = Qt.binding(() => hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor);
normalColor = Qt.binding(() => JamiTheme.primaryBackgroundColor);
}
@@ -354,7 +356,7 @@ Control {
anchors.rightMargin: 5
anchors.right: isOutgoing ? more.left : undefined
anchors.left: !isOutgoing ? more.right : undefined
- visible: CurrentAccount.type !== Profile.Type.SIP && root.type !== Interaction.Type.CALL && Body !== "" && (bubbleArea.bubbleHovered || hovered || more.hovered || share.hovered || bgHandler.hovered)
+ visible: msgRowlayout.msgHovered
onClicked: {
MessagesAdapter.editId = "";
@@ -378,13 +380,13 @@ Control {
anchors.rightMargin: 5
anchors.right: isOutgoing ? reply.left : undefined
anchors.left: !isOutgoing ? reply.right : undefined
- visible: CurrentAccount.type !== Profile.Type.SIP && root.type !== Interaction.Type.CALL && Body !== "" && (bubbleArea.bubbleHovered || hovered || reply.hovered || more.hovered || bgHandler.hovered)
+ visible: msgRowlayout.msgHovered
property bool isOpen: false
property var obj: undefined
function setBindings() { // when the popup is closed, setBindings is called to reset the icon's visual settings
share.isOpen = false;
- visible = Qt.binding(() => CurrentAccount.type !== Profile.Type.SIP && root.type !== Interaction.Type.CALL && Body !== "" && (bubbleArea.bubbleHovered || hovered || reply.hovered || more.hovered || bgHandler.hovered));
+ visible = Qt.binding(() => msgRowlayout.msgHovered);
imageColor = Qt.binding(() => hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor);
normalColor = Qt.binding(() => JamiTheme.primaryBackgroundColor);
}
diff --git a/src/app/commoncomponents/ShowMoreMenu.qml b/src/app/commoncomponents/ShowMoreMenu.qml
index 0a8f3f9c8..6c40904cf 100644
--- a/src/app/commoncomponents/ShowMoreMenu.qml
+++ b/src/app/commoncomponents/ShowMoreMenu.qml
@@ -89,8 +89,10 @@ BaseContextMenu {
emojiPicker.emojiIsPicked.connect(function (content) {
if (emojiReplied.includes(content)) {
MessagesAdapter.removeEmojiReaction(CurrentConversation.id, content, msgId);
+ parent.setBindings();
} else {
MessagesAdapter.addEmojiReaction(CurrentConversation.id, content, msgId);
+ parent.setBindings();
}
});
if (emojiPicker !== null) {
@@ -107,8 +109,11 @@ BaseContextMenu {
property bool isScrolling: listView.verticalScrollBar.active
onOpened: root.closeWithoutAnimation = false
- onClosed: if (emojiPicker)
- emojiPicker.closeEmojiPicker()
+ onClosed: {
+ if (emojiPicker) {
+ emojiPicker.closeEmojiPicker();
+ }
+ }
function getQuickEmojiListModel() {
const defaultModel = ["👍", "👎", "😂"];
--
GitLab