From ae56a360c45bb020d8e1af5e2b197176748a9e87 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Mon, 22 Feb 2021 14:47:32 -0500 Subject: [PATCH] fix: message height taking into account the image even when hidden --- .../Chat/ChatColumn/MessageComponents/CompactMessage.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml index c18a517795..26c9c96cb2 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml @@ -59,7 +59,8 @@ Item { id: messageContainer anchors.top: dateGroupLbl.visible ? dateGroupLbl.bottom : parent.top anchors.topMargin: dateGroupLbl.visible ? Style.current.padding : 0 - height: childrenRect.height + (chatName.visible || emojiReactionLoader.active ? Style.current.smallPadding : 0) + height: childrenRect.height + + (chatName.visible || emojiReactionLoader.active ? Style.current.smallPadding : 0) + (chatName.visible && emojiReactionLoader.active ? 5 : 0) + (emojiReactionLoader.active ? emojiReactionLoader.height: 0) + (retry.visible && !chatTime.visible ? Style.current.smallPadding : 0) @@ -68,10 +69,9 @@ Item { color: root.isHovered || isMessageActive ? (hasMention ? Style.current.mentionMessageHoverColor : Style.current.backgroundHoverLight) : (hasMention ? Style.current.mentionMessageColor : Style.current.transparent) - UserImage { id: chatImage - visible: authorCurrentMsg != authorPrevMsg + active: isMessage && authorCurrentMsg != authorPrevMsg anchors.left: parent.left anchors.leftMargin: Style.current.padding anchors.top: parent.top