diff options
| author | tastytea <tastytea@tastytea.de> | 2021-12-27 22:59:51 +0100 |
|---|---|---|
| committer | tastytea <tastytea@tastytea.de> | 2021-12-27 22:59:51 +0100 |
| commit | 5ac11954027a3209bc5820db8219a76de7b798a5 (patch) | |
| tree | 8149beaeaeb111f85951386a5042a44e155f9e5c /src/MxcImageProvider.cpp | |
| parent | 7086e23bdd73143529882e221b8f0963c8a7e82c (diff) | |
MxcImageProvider: Only use scaledToHeight if width <= 0.
Diffstat (limited to 'src/MxcImageProvider.cpp')
| -rw-r--r-- | src/MxcImageProvider.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp index 97cbfff3..74b4bedc 100644 --- a/src/MxcImageProvider.cpp +++ b/src/MxcImageProvider.cpp @@ -124,8 +124,11 @@ MxcImageProvider::download(const QString &id, if (fileInfo.exists()) { QImage image = utils::readImageFromFile(fileInfo.absoluteFilePath()); if (!image.isNull()) { - if (requestedSize != image.size()) { + if (requestedSize.width() <= 0) { image = image.scaledToHeight(requestedSize.height(), Qt::SmoothTransformation); + } else { + image = + image.scaled(requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); } if (radius != 0) { @@ -157,9 +160,12 @@ MxcImageProvider::download(const QString &id, auto data = QByteArray(res.data(), (int)res.size()); QImage image = utils::readImage(data); if (!image.isNull()) { - if (requestedSize != image.size()) { + if (requestedSize.width() <= 0) { image = image.scaledToHeight(requestedSize.height(), Qt::SmoothTransformation); + } else { + image = + image.scaled(requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); } if (radius != 0) { |