From fd19e0f27dd35ad83de0231bde2529c2d89ec2a4 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 3 Nov 2020 17:16:44 +0100 Subject: [PATCH] Workarround empty requestedSize in Kirigami Avatar --- src/matriximageprovider.cpp | 7 +++---- src/matriximageprovider.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/matriximageprovider.cpp b/src/matriximageprovider.cpp index 9c80641d7..884fd9e74 100644 --- a/src/matriximageprovider.cpp +++ b/src/matriximageprovider.cpp @@ -14,7 +14,7 @@ using Quotient::BaseJob; -ThumbnailResponse::ThumbnailResponse(Quotient::Connection *c, QString id, const QSize &size) +ThumbnailResponse::ThumbnailResponse(Quotient::Connection *c, QString id, QSize size) : c(c) , mediaId(std::move(id)) , requestedSize(size) @@ -22,9 +22,8 @@ ThumbnailResponse::ThumbnailResponse(Quotient::Connection *c, QString id, const , errorStr("Image request hasn't started") { if (requestedSize.isEmpty()) { - errorStr.clear(); - Q_EMIT finished(); - return; + requestedSize.setHeight(100); + requestedSize.setWidth(100); } if (mediaId.count('/') != 1) { errorStr = tr("Media id '%1' doesn't follow server/mediaId pattern").arg(mediaId); diff --git a/src/matriximageprovider.h b/src/matriximageprovider.h index a8dc1599a..b004482c9 100644 --- a/src/matriximageprovider.h +++ b/src/matriximageprovider.h @@ -25,7 +25,7 @@ class ThumbnailResponse : public QQuickImageResponse { Q_OBJECT public: - ThumbnailResponse(Quotient::Connection *c, QString mediaId, const QSize &requestedSize); + ThumbnailResponse(Quotient::Connection *c, QString mediaId, QSize requestedSize); ~ThumbnailResponse() override = default; private Q_SLOTS: @@ -36,7 +36,7 @@ private Q_SLOTS: private: Quotient::Connection *c; const QString mediaId; - const QSize requestedSize; + QSize requestedSize; const QString localFile; Quotient::MediaThumbnailJob *job = nullptr;