Fix review comments.

Signed-off-by: alex-z <[email protected]>
nextcloud · Oct 6, 2023 · cedcc0c · cedcc0c
1 parent 7f58be4
commit cedcc0c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 28 deletions.
diff --git a/src/gui/tray/NCIconWithBackgroundImage.qml b/src/gui/tray/NCIconWithBackgroundImage.qml
@@ -15,32 +15,14 @@
 import QtQuick 2.15
 import Style 1.0
 
-Item {
+Image {
     id: root
 
-    property alias source: icon.source
-    property alias sourceSize: icon.sourceSize
-    property alias backgroundIconSource: backgroundImage.source
+    property alias icon: icon
 
-    implicitWidth: backgroundImage.source !== "" ? backgroundImage.implicitWidth : icon.implicitWidth
-    implicitHeight: backgroundImage.source !== "" ? backgroundImage.implicitHeight : icon.implicitHeight
-
-    Image {
-        id: backgroundImage
-
-        anchors.fill: parent
-
-        cache: true
-        mipmap: true
-
-        sourceSize {
-            width: root.width
-            height: root.height
-        }
-
-        fillMode: Image.PreserveAspectFit
-        visible: source !== ""
-    }
+    cache: true
+    mipmap: true
+    fillMode: Image.PreserveAspectFit
 
     Image {
         id: icon
@@ -49,7 +31,6 @@ Item {
 
         cache: true
         mipmap: true
-
         fillMode: Image.PreserveAspectFit
         visible: source !== ""
     }

diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml
@@ -47,11 +47,11 @@ MenuItem {
         spacing: Style.trayHorizontalMargin
 
         NCIconWithBackgroundImage {
-            source: root.iconSource
-            sourceSize.width: root.height * 0.25
-            sourceSize.height: root.height * 0.25
+            source: root.backgroundIconSource
 
-            backgroundIconSource: root.backgroundIconSource
+            icon.source: root.iconSource
+            icon.height: height * Style.smallIconScaleFactor
+            icon.width: icon.height
 
             Layout.preferredHeight: root.height * Style.smallIconScaleFactor
             Layout.preferredWidth: root.height * Style.smallIconScaleFactor
@@ -64,7 +64,10 @@ MenuItem {
 
             spacing: Style.extraSmallSpacing
 
+            Layout.alignment: Qt.AlignVCenter
+
             Layout.fillWidth: true
+
         }
     }
 }