From 8fa912ed85644e22c2ab80c40072cefc68454bbe Mon Sep 17 00:00:00 2001 From: Malte E Date: Thu, 10 Mar 2022 21:47:07 +0100 Subject: [PATCH 1/2] right-align reactions of right-aligned bubbles --- resources/qml/Reactions.qml | 2 -- resources/qml/TimelineRow.qml | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml index cb2bcb24..aaf32647 100644 --- a/resources/qml/Reactions.qml +++ b/resources/qml/Reactions.qml @@ -19,8 +19,6 @@ Flow { property string eventId property alias reactions: repeater.model - anchors.left: parent.left - anchors.right: parent.right spacing: 4 Repeater { diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml index 8b34c1ee..7ebcdf7e 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml @@ -247,8 +247,11 @@ Item { anchors { top: row.bottom topMargin: -2 - left: row.left + left: row.bubbleOnRight? undefined : row.left + right: row.bubbleOnRight? row.right : undefined } + width: row.maxWidth + layoutDirection: row.bubbleOnRight? Qt.RightToLeft : Qt.LeftToRight id: reactionRow From 7ec0539476bfee5514b92a055e1cbc6e46ea7c69 Mon Sep 17 00:00:00 2001 From: Malte E Date: Thu, 10 Mar 2022 21:54:26 +0100 Subject: [PATCH 2/2] reduce replied-to message to implicitWidth if non-bubble layout is used --- resources/qml/TimelineRow.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml index 7ebcdf7e..97e2bcf0 100644 --- a/resources/qml/TimelineRow.qml +++ b/resources/qml/TimelineRow.qml @@ -103,6 +103,7 @@ Item { Layout.row: 0 Layout.column: 0 Layout.fillWidth: true + Layout.maximumWidth: Settings.bubbles? Number.MAX_VALUE : implicitWidth Layout.bottomMargin: visible? 2 : 0 Layout.preferredHeight: height id: reply