Ensure we query the correct icon size

owncloud · Jun 7, 2024 · 2da7766 · 2da7766
1 parent 7b5dd02
commit 2da7766
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/gui/qml/AccountButton.qml b/src/gui/qml/AccountButton.qml
@@ -38,6 +38,8 @@ ToolButton {
             Layout.preferredWidth: control.icon.width
             fillMode: Image.PreserveAspectFit
             source: control.icon.source
+            sourceSize.height: control.icon.height
+            sourceSize.width: control.icon.width
         }
         Label {
             Layout.fillHeight: true

diff --git a/src/gui/qml/FolderError.qml b/src/gui/qml/FolderError.qml
@@ -28,6 +28,8 @@ ColumnLayout {
             source: "image://ownCloud/core/warning"
             Layout.maximumHeight: 16
             Layout.maximumWidth: 16
+            sourceSize.width: width
+            sourceSize.height: height
         }
         Label {
             id: label

diff --git a/src/gui/spaces/qml/SpaceDelegate.qml b/src/gui/spaces/qml/SpaceDelegate.qml
@@ -45,6 +45,8 @@ Item {
                     id: image
                     anchors.fill: parent
                     fillMode: Image.PreserveAspectFit
+                    sourceSize.width: width
+                    sourceSize.height: height
                 }
             }
             ColumnLayout {
@@ -60,6 +62,8 @@ Item {
                         Layout.preferredHeight: 16
                         Layout.preferredWidth: 16
                         visible: statusSource
+                        sourceSize.width: width
+                        sourceSize.height: height
                     }
                     Label {
                         id: title

diff --git a/src/resources/resources.cpp b/src/resources/resources.cpp
@@ -200,7 +200,9 @@ QPixmap CoreImageProvider::requestPixmap(const QString &id, QSize *size, const Q
     } else {
         Q_UNREACHABLE();
     }
-    const QSize actualSize = requestedSize.isValid() ? requestedSize : icon.availableSizes().first();
+    // the sourceSize of the Image must be provided
+    Q_ASSERT(requestedSize.isValid());
+    const QSize actualSize = requestedSize.isValid() ? requestedSize : icon.availableSizes().constFirst();
     if (size) {
         *size = actualSize;
     }