Port redacted messages

This commit is contained in:
Nicolas Werner 2023-07-28 19:30:13 +02:00
parent eab8731f5b
commit 466d3cd52c
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 31 additions and 13 deletions

View file

@ -285,6 +285,19 @@ Item {
}
}
EventDelegateChoice {
roleValues: [
MtxEvent.Redacted
]
Redacted {
Layout.fillWidth: true
required property string userId
required property string userName
}
}
EventDelegateChoice {
roleValues: [
]

View file

@ -7,20 +7,16 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import im.nheko 1.0
Rectangle{
Control {
id: msgRoot
height: redactedLayout.implicitHeight + Nheko.paddingSmall
implicitWidth: redactedLayout.implicitWidth + 2 * Nheko.paddingMedium
width: Math.min(parent.width,implicitWidth+1)
radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingSmall
color: palette.alternateBase
property int metadataWidth
property bool fitsMetadata: parent.width - redactedLayout.width > metadataWidth + 4
property int metadataWidth: 0
property bool fitsMetadata: false //parent.width - redactedLayout.width > metadataWidth + 4
RowLayout {
required property string eventId
contentItem: RowLayout {
id: redactedLayout
anchors.centerIn: parent
width: parent.width - 2 * Nheko.paddingMedium
spacing: Nheko.paddingSmall
Image {
@ -34,9 +30,9 @@ Rectangle{
id: redactedLabel
Layout.margins: 0
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
Layout.preferredWidth: implicitWidth
Layout.maximumWidth: implicitWidth + 1
Layout.fillWidth: true
property var redactedPair: room.formatRedactedEvent(eventId)
property var redactedPair: room.formatRedactedEvent(msgRoot.eventId)
text: redactedPair["first"]
wrapMode: Label.WordWrap
color: palette.text
@ -48,4 +44,13 @@ Rectangle{
}
}
}
padding: Nheko.paddingSmall
Layout.maximumWidth: redactedLayout.Layout.maximumWidth + padding * 2
background: Rectangle {
color: palette.alternateBase
radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingSmall
}
}