Skip to content
Snippets Groups Projects
Verified Commit 43c8e64e authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Fix alignment of file messages and redactions

parent e96b5529
No related branches found
No related tags found
No related merge requests found
......@@ -216,6 +216,11 @@ Item {
]
}
Item {
// spacer to fill width if needed
Layout.fillWidth: true
}
RowLayout {
id: metadata
......
......@@ -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
}
......
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment