Fix alignment of file messages and redactions

This commit is contained in:
Nicolas Werner 2023-09-17 23:11:24 +02:00
parent e96b552959
commit 43c8e64ed3
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 12 additions and 7 deletions

View file

@ -216,6 +216,11 @@ Item {
]
}
Item {
// spacer to fill width if needed
Layout.fillWidth: true
}
RowLayout {
id: metadata

View file

@ -141,8 +141,8 @@ EventDelegateChooser {
required property string userName
Layout.fillWidth: true
Layout.maximumWidth: tempWidth
Layout.maximumHeight: timelineView.height / 8
//Layout.maximumWidth: tempWidth
//Layout.maximumHeight: timelineView.height / 8
containerHeight: timelineView.height
}
}
@ -181,7 +181,6 @@ EventDelegateChooser {
EncryptionEnabled {
required property string userId
required property string userName
Layout.fillWidth: true
}

View file

@ -11,6 +11,7 @@ import im.nheko
AbstractButton {
required property int type
required property int originalWidth
required property int originalHeight
required property double proportionalHeight
required property string url
required property string blurhash
@ -21,10 +22,10 @@ AbstractButton {
required property int containerHeight
property double divisor: isReply ? 5 : 3
property int tempWidth: originalWidth < 1? 400: originalWidth
Layout.preferredWidth: Math.round(tempWidth*Math.min((containerHeight/divisor)/(tempWidth*proportionalHeight), 1))
Layout.preferredHeight: width*proportionalHeight
//Layout.maximumWidth: originalWidth
Layout.maximumHeight: Math.min(originalHeight, containerHeight / divisor)
implicitWidth: height/proportionalHeight
implicitHeight: Math.min(Layout.maximumHeight, width*proportionalHeight)
hoverEnabled: true
state: (img.status != Image.Ready || timeline.privacyScreen.active) ? "BlurhashVisible" : "ImageVisible"