summary refs log tree commit diff
diff options
context:
space:
mode:
authorMalte E <malte.e@mailbox.org>2022-02-04 21:20:25 +0100
committerMalte E <malte.e@mailbox.org>2022-02-04 21:20:25 +0100
commit3c8c02e80265e9ac285756c803b938c016b1597c (patch)
tree63e3eab36741903dd3d806511d4b9b2887ee5419
parentprepare code for message bubbles and dynamic message layout (diff)
downloadnheko-3c8c02e80265e9ac285756c803b938c016b1597c.tar.xz
Revert removal of width and height in TextMessage and implicitWidth in MessageDelegate
-rw-r--r--resources/qml/delegates/MessageDelegate.qml2
-rw-r--r--resources/qml/delegates/TextMessage.qml4
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; } </style> " + formatted.replace("<pre>", "<pre style='white-space: pre-wrap; background-color: " + Nheko.colors.alternateBase + "'>").replace("<del>", "<s>").replace("</del>", "</s>").replace("<strike>", "<s>").replace("</strike>", "</s>") -// 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