From 93efd2fb78cb7b04c668c617ab5ee5152dfee5ac Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Fri, 19 May 2023 22:38:30 +0800
Subject: [PATCH] Respect icon.height and width in custom button contents

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/tray/CustomButton.qml     | 2 ++
 src/gui/tray/NCButtonContents.qml | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/gui/tray/CustomButton.qml b/src/gui/tray/CustomButton.qml
index 08ae77e972..e7a4fd6c75 100644
--- a/src/gui/tray/CustomButton.qml
+++ b/src/gui/tray/CustomButton.qml
@@ -56,6 +56,8 @@ Button {
         hovered: root.hovered
         imageSourceHover: root.imageSourceHover
         imageSource: root.icon.source
+        imageSourceWidth: root.icon.width
+        imageSourceHeight: root.icon.height
         text: root.text
         textColor: root.textColor
         textColorHovered: root.textColorHovered
diff --git a/src/gui/tray/NCButtonContents.qml b/src/gui/tray/NCButtonContents.qml
index 4247481b6b..a2f0afb797 100644
--- a/src/gui/tray/NCButtonContents.qml
+++ b/src/gui/tray/NCButtonContents.qml
@@ -24,6 +24,8 @@ RowLayout {
     property bool hovered: false
     property string imageSourceHover: ""
     property string imageSource: ""
+    property int imageSourceWidth: 64
+    property int imageSourceHeight: 64
     property string text: ""
     property var display
 
@@ -38,6 +40,12 @@ RowLayout {
         Layout.maximumHeight: root.height
 
         source: root.hovered ? root.imageSourceHover : root.imageSource
+
+        sourceSize {
+            width: root.imageSourceWidth
+            height: root.imageSourceHeight
+        }
+
         fillMode: Image.PreserveAspectFit
         horizontalAlignment: Image.AlignHCenter
         verticalAlignment: Image.AlignVCenter