From 8a78920b8804f26faea7a598cb812e84426b0f2e Mon Sep 17 00:00:00 2001 From: Malte E Date: Sat, 12 Mar 2022 22:34:16 +0100 Subject: [PATCH 1/3] allow bubbles to be not larger than necessary --- resources/qml/TimelineRow.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml index 97e2bcf0..a3040412 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml @@ -78,7 +78,7 @@ Item { anchors.right: isStateEvent? undefined: (bubbleOnRight? parent.right : undefined) anchors.horizontalCenter: isStateEvent? parent.horizontalCenter : undefined property int maxWidth: parent.width-anchors.leftMargin-anchors.rightMargin - width: Settings.bubbles? Math.min(maxWidth,implicitWidth+metadata.width+12) : maxWidth + width: Settings.bubbles? Math.min(maxWidth,Math.max(reply.implicitWidth+8,contentItem.implicitWidth+metadata.width+20)) : maxWidth leftPadding: 4 rightPadding: (Settings.bubbles && !isStateEvent)? 4: 2 topPadding: (Settings.bubbles && !isStateEvent)? 4: 2 @@ -142,7 +142,6 @@ Item { Layout.column: 0 Layout.fillWidth: true Layout.preferredHeight: height - Layout.minimumWidth: 80 id: contentItem blurhash: r.blurhash From 3e59b76b54098d252cdfeb8bd3aebc6225a156c4 Mon Sep 17 00:00:00 2001 From: Malte E Date: Sat, 12 Mar 2022 22:46:08 +0100 Subject: [PATCH 2/3] add space below datebubble and own message bubbles --- resources/qml/MessageView.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index b9db224d..6363a87d 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -256,7 +256,7 @@ Item { Column { topPadding: userName_.visible? 4: 0 - bottomPadding: Settings.bubbles? (isSender? 0 : 2) : 3 + bottomPadding: Settings.bubbles? (isSender && previousMessageDay == day? 0 : 2) : 3 spacing: 8 visible: (previousMessageUserId !== userId || previousMessageDay !== day || isStateEvent !== previousMessageIsStateEvent) width: parentWidth @@ -396,7 +396,7 @@ Item { anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined width: chat.delegateMaxWidth - height: section.active ? section.height + timelinerow.height : timelinerow.height + height: section.active ? section.height + timelinerow.height: timelinerow.height hoverEnabled: true From 637abac334755bb115f2d83f97d55ae6218f62bb Mon Sep 17 00:00:00 2001 From: Malte E Date: Sat, 12 Mar 2022 22:51:02 +0100 Subject: [PATCH 3/3] add space between date bubble and own messages --- resources/qml/MessageView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index 6363a87d..a9a142b9 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -396,7 +396,7 @@ Item { anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined width: chat.delegateMaxWidth - height: section.active ? section.height + timelinerow.height: timelinerow.height + height: section.active ? section.height + timelinerow.height : timelinerow.height hoverEnabled: true