Move reply pane to use MessageContentModel

Move reply pane to use MessageContentModel. This means the reply pane component is no longer required.

This commit also limits the size of code and image componets in a reply to keep them from getting too huge.

src/chatbar/CMakeLists.txt

@@ -11,7 +11,6 @@ ecm_add_qml_module(chatbar GENERATE_PLUGIN_SOURCE
         CompletionMenu.qml
         EmojiDelegate.qml
         EmojiGrid.qml
-        ReplyPane.qml
         PieProgressBar.qml
         EmojiPicker.qml
         EmojiDialog.qml

src/chatbar/ChatBar.qml

@@ -175,6 +175,7 @@ QQC2.Control {
 
             Layout.fillWidth: true
             Layout.margins: Kirigami.Units.largeSpacing
+            Layout.preferredHeight: active ? item.implicitHeight : 0
 
             active: visible
             visible: root.currentRoom.mainCache.replyId.length > 0 || root.currentRoom.mainCache.attachmentPath.length > 0
@@ -361,15 +362,32 @@ QQC2.Control {
 
     Component {
         id: replyPane
-        ReplyPane {
-            userName: _private.chatBarCache.relationUser.displayName
-            userColor: _private.chatBarCache.relationUser.color
-            userAvatar: _private.chatBarCache.relationUser.avatarUrl
-            text: _private.chatBarCache.relationMessage
+        Item {
+            implicitWidth: replyComponent.implicitWidth
+            implicitHeight: replyComponent.implicitHeight
+            ReplyComponent {
+                id: replyComponent
+                replyEventId: _private.chatBarCache.replyId
+                replyAuthor: _private.chatBarCache.relationAuthor
+                replyContentModel: _private.chatBarCache.relationEventContentModel
+                maxContentWidth: paneLoader.item.width
+            }
+            QQC2.Button {
+                id: cancelButton
 
-            onCancel: {
-                _private.chatBarCache.replyId = "";
-                _private.chatBarCache.attachmentPath = "";
+                anchors.top: parent.top
+                anchors.right: parent.right
+
+                display: QQC2.AbstractButton.IconOnly
+                text: i18nc("@action:button", "Cancel reply")
+                icon.name: "dialog-close"
+                onClicked: {
+                    _private.chatBarCache.replyId = "";
+                    _private.chatBarCache.attachmentPath = "";
+                }
+                QQC2.ToolTip.text: text
+                QQC2.ToolTip.visible: hovered
+                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
             }
         }
     }

src/chatbar/ReplyPane.qml

@@ -1,98 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls as QQC2
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
-
-import org.kde.neochat
-
-RowLayout {
-    id: root
-
-    property string userName
-    property color userColor
-    property url userAvatar: ""
-    property var text
-
-    signal cancel
-
-    Rectangle {
-        id: verticalBorder
-
-        Layout.fillHeight: true
-
-        implicitWidth: Kirigami.Units.smallSpacing
-        color: userColor
-    }
-    ColumnLayout {
-        RowLayout {
-            KirigamiComponents.Avatar {
-                id: replyAvatar
-
-                implicitWidth: Kirigami.Units.iconSizes.small
-                implicitHeight: Kirigami.Units.iconSizes.small
-
-                source: userAvatar
-                name: userName
-                color: userColor
-            }
-            QQC2.Label {
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignLeft
-
-                color: userColor
-                text: userName
-                elide: Text.ElideRight
-            }
-        }
-        QQC2.TextArea {
-            id: textArea
-
-            Layout.fillWidth: true
-
-            leftPadding: 0
-            rightPadding: 0
-            topPadding: 0
-            bottomPadding: 0
-            text: "<style> a{color:" + Kirigami.Theme.linkColor + ";}.user-pill{}</style>" + replyTextMetrics.elidedText
-            selectByMouse: true
-            selectByKeyboard: true
-            readOnly: true
-            wrapMode: TextEdit.Wrap
-            textFormat: TextEdit.RichText
-            background: Item {}
-            HoverHandler {
-                cursorShape: textArea.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
-            }
-
-            TextMetrics {
-                id: replyTextMetrics
-
-                text: root.text
-                font: textArea.font
-                elide: Qt.ElideRight
-                elideWidth: textArea.width * 2 - Kirigami.Units.smallSpacing * 2
-            }
-        }
-    }
-    QQC2.ToolButton {
-        id: cancelButton
-
-        Layout.alignment: Qt.AlignVCenter
-
-        display: QQC2.AbstractButton.IconOnly
-        text: i18nc("@action:button", "Cancel reply")
-        icon.name: "dialog-close"
-        onClicked: {
-            root.cancel();
-        }
-        QQC2.ToolTip.text: text
-        QQC2.ToolTip.visible: hovered
-        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-    }
-}