Fix dark/light mode for account menu.

Signed-off-by: Camila Ayres <[email protected]>
nextcloud · Sep 11, 2024 · 789a29e · 789a29e
1 parent b1812bc
commit 789a29e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
@@ -48,8 +48,8 @@ AbstractButton {
 
         Image {
             id: accountAvatar
-            Layout.leftMargin: 7
-            verticalAlignment: Qt.AlignCenter
+            Layout.leftMargin: Style.accountIconsMenuMargin
+            verticalAlignment: Qt.AlignCenters
             cache: false
             source: model.avatar !== "" ? model.avatar : Theme.darkMode ? "image://avatars/fallbackWhite" : "image://avatars/fallbackBlack"
             Layout.preferredHeight: Style.accountAvatarSize
@@ -148,7 +148,7 @@ AbstractButton {
 
             Image {
                 anchors.fill: parent
-                source: "image://svgimage-custom-color/more.svg/"
+                source: "image://svgimage-custom-color/more.svg/" + palette.windowText
                 fillMode: Image.PreserveAspectFit
             }
 

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
@@ -324,11 +324,12 @@ ApplicationWindow {
                                 spacing: 0
 
                                 Image {
-                                    Layout.leftMargin: 12
-                                    verticalAlignment: Qt.AlignCenter
-                                    source: "image://svgimage-custom-color/add.svg"
-                                    sourceSize.width: Style.headerButtonIconSize
-                                    sourceSize.height: Style.headerButtonIconSize
+                                    Layout.leftMargin: Style.accountIconsMenuMargin
+                                    verticalAlignment: Qt.AlignVCenter
+                                    horizontalAlignment: Qt.AlignCenter
+                                    source: "image://svgimage-custom-color/add.svg/" + palette.windowText
+                                    sourceSize.width: Style.addButtonIconSize
+                                    sourceSize.height: Style.addButtonIconSize
                                 }
                                 EnforcedPlainTextLabel {
                                     Layout.leftMargin: 14

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
@@ -103,9 +103,12 @@ QtObject {
     property int addAccountButtonHeight: 50
 
     property int headerButtonIconSize: 32
+    property int addButtonIconSize: 26
     property int dismissButtonSize: 26
     property int minimumActivityItemHeight: 24
 
+    property int accountIconsMenuMargin: 7
+
     property int activityLabelBaseWidth: 240
 
     property int talkReplyTextFieldPreferredHeight: 34