From 7a11b69f998553056b568d163c60aa635114fcd7 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 9 Mar 2022 20:15:37 +0100
Subject: [PATCH] Fix images being cropped instead of scaled
---
resources/qml/delegates/ImageMessage.qml | 2 +-
resources/qml/delegates/PlayableMediaMessage.qml | 2 +-
resources/qml/dialogs/ImagePackEditorDialog.qml | 2 +-
resources/qml/dialogs/ImagePackSettingsDialog.qml | 2 +-
resources/qml/emoji/StickerPicker.qml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 7664d6fdc..efd4f4a5d 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -45,7 +45,7 @@ Item {
visible: !mxcimage.loaded
anchors.fill: parent
- source: url.replace("mxc://", "image://MxcImage/")
+ source: url.replace("mxc://", "image://MxcImage/") + "?scale"
asynchronous: true
fillMode: Image.PreserveAspectFit
smooth: true
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 5188b80e0..4f19275d7 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -57,7 +57,7 @@ Item {
Image {
anchors.fill: parent
- source: thumbnailUrl.replace("mxc://", "image://MxcImage/")
+ source: thumbnailUrl.replace("mxc://", "image://MxcImage/") + "?scale"
asynchronous: true
fillMode: Image.PreserveAspectFit
diff --git a/resources/qml/dialogs/ImagePackEditorDialog.qml b/resources/qml/dialogs/ImagePackEditorDialog.qml
index eb420fced..49c9ea077 100644
--- a/resources/qml/dialogs/ImagePackEditorDialog.qml
+++ b/resources/qml/dialogs/ImagePackEditorDialog.qml
@@ -243,7 +243,7 @@ ApplicationWindow {
Avatar {
Layout.columnSpan: 2
- url: imagePack.data(imagePack.index(currentImageIndex, 0), SingleImagePackModel.Url).replace("mxc://", "image://MxcImage/")
+ url: imagePack.data(imagePack.index(currentImageIndex, 0), SingleImagePackModel.Url).replace("mxc://", "image://MxcImage/") + "?scale"
displayName: imagePack.data(imagePack.index(currentImageIndex, 0), SingleImagePackModel.ShortCode)
roomid: displayName
height: 130
diff --git a/resources/qml/dialogs/ImagePackSettingsDialog.qml b/resources/qml/dialogs/ImagePackSettingsDialog.qml
index 2ce19b80a..24f70f681 100644
--- a/resources/qml/dialogs/ImagePackSettingsDialog.qml
+++ b/resources/qml/dialogs/ImagePackSettingsDialog.qml
@@ -233,7 +233,7 @@ ApplicationWindow {
contentItem: Image {
height: stickerDim
width: stickerDim
- source: model.url.replace("mxc://", "image://MxcImage/")
+ source: model.url.replace("mxc://", "image://MxcImage/") + "?scale"
fillMode: Image.PreserveAspectFit
}
diff --git a/resources/qml/emoji/StickerPicker.qml b/resources/qml/emoji/StickerPicker.qml
index 5f3f5bc71..d38461a1d 100644
--- a/resources/qml/emoji/StickerPicker.qml
+++ b/resources/qml/emoji/StickerPicker.qml
@@ -157,7 +157,7 @@ Menu {
contentItem: Image {
height: stickerDim
width: stickerDim
- source: model.url.replace("mxc://", "image://MxcImage/")
+ source: model.url.replace("mxc://", "image://MxcImage/") + "?scale"
fillMode: Image.PreserveAspectFit
}
--
GitLab