From 3c8c02e80265e9ac285756c803b938c016b1597c Mon Sep 17 00:00:00 2001 From: Malte E Date: Fri, 4 Feb 2022 21:20:25 +0100 Subject: [PATCH] Revert removal of width and height in TextMessage and implicitWidth in MessageDelegate --- resources/qml/delegates/MessageDelegate.qml | 2 +- resources/qml/delegates/TextMessage.qml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index ad6e7580..8c74bfe8 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -13,7 +13,7 @@ Item { required property bool isReply property alias child: chooser.child -// property real implicitWidth: (chooser.child && chooser.child.implicitWidth) ? chooser.child.implicitWidth : width + property real implicitWidth: (chooser.child && chooser.child.implicitWidth) ? chooser.child.implicitWidth : width required property double proportionalHeight required property int type required property string typeString diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml index c9b8a882..eea8cd1e 100644 --- a/resources/qml/delegates/TextMessage.qml +++ b/resources/qml/delegates/TextMessage.qml @@ -33,8 +33,8 @@ MatrixText { blockquote { margin-left: 1em; } " + formatted.replace("
", "
").replace("", "").replace("", "").replace("", "").replace("", "")
-//    width: parent.width
-    //height: isReply ? Math.round(Math.min(timelineView.height / 8, implicitHeight)) : undefined
+    width: parent.width
+    height: isReply ? Math.round(Math.min(timelineView.height / 8, implicitHeight)) : undefined
     clip: isReply
     selectByMouse: !Settings.mobileMode && !isReply
     font.pointSize: (Settings.enlargeEmojiOnlyMessages && isOnlyEmoji > 0 && isOnlyEmoji < 4) ? Settings.fontSize * 3 : Settings.fontSize