Fix pending reply sizing

2 files changed, 9 insertions, 1 deletions

diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml

index 17ce7ee4..7f2917cc 100644
--- a/resources/qml/ReplyPopup.qml
+++ b/resources/qml/ReplyPopup.qml
@@ -33,6 +33,7 @@ Rectangle {
         userColor: TimelineManager.userColor(modelData.userId, palette.window)
         visible: room && room.reply
         maxWidth: parent.width - anchors.leftMargin - anchors.rightMargin
+        limitHeight: true
     }
     ImageButton {
         id: closeReplyButton
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml

index ff46347f..f0884a06 100644
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
@@ -20,9 +20,10 @@ AbstractButton {
 
     property string userId: eventId ? room.dataById(eventId, Room.UserId, "") : ""
     property string userName: eventId ? room.dataById(eventId, Room.UserName, "") : ""
-    implicitHeight: replyContainer.implicitHeight
+    implicitHeight: replyContainer.height
     implicitWidth: replyContainer.implicitWidth
     required property int maxWidth
+    property bool limitHeight: false
 
     NhekoCursorShape {
         anchors.fill: parent
@@ -48,6 +49,7 @@ AbstractButton {
         replyTo: ""
         mainInset: 4 + Nheko.paddingMedium
         maxWidth: r.maxWidth
+        limitAsReply: r.limitHeight
 
         //height: replyContainer.implicitHeight
         data: Row {
@@ -55,6 +57,10 @@ AbstractButton {
 
             spacing: Nheko.paddingSmall
 
+            clip: r.limitHeight
+
+            height: Math.min( timelineEvent.main?.height, timelineView.height / 10) + Nheko.paddingSmall + usernameBtn.height
+
             Rectangle {
                 id: colorline
 
@@ -71,6 +77,7 @@ AbstractButton {
                 AbstractButton {
                     id: usernameBtn
 
+
                     contentItem: Label {
                         id: userName_
                         text: r.userName