Fix dark/light mode for account menu.

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index ea2d222b1574d0beb0eeab33331f86cfcf730010..b37d4c3b250aa63da8d610f4b692a00c855094d8 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -48,7 +48,7 @@ AbstractButton {
 \r
         Image {\r
             id: accountAvatar\r
-            Layout.leftMargin: 7\r
+            Layout.leftMargin: Style.accountIconsMenuMargin\r
             verticalAlignment: Qt.AlignCenter\r
             cache: false\r
             source: model.avatar !== "" ? model.avatar : Theme.darkMode ? "image://avatars/fallbackWhite" : "image://avatars/fallbackBlack"\r
@@ -148,7 +148,7 @@ AbstractButton {
 \r
             Image {\r
                 anchors.fill: parent\r
-                source: "image://svgimage-custom-color/more.svg/"\r
+                source: "image://svgimage-custom-color/more.svg/" + palette.windowText\r
                 fillMode: Image.PreserveAspectFit\r
             }\r
 \r

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

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 796e2b63a68a4c687eabdbdb8ed804889fc6a087..03eec1c8c1b0b863fac4337bfbc8078366a6902e 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -103,9 +103,12 @@ QtObject {
     property int addAccountButtonHeight: 50\r
 \r
     property int headerButtonIconSize: 32\r
+    property int addButtonIconSize: 26\r
     property int dismissButtonSize: 26\r
     property int minimumActivityItemHeight: 24\r
 \r
+    property int accountIconsMenuMargin: 7\r
+\r
     property int activityLabelBaseWidth: 240\r
 \r
     property int talkReplyTextFieldPreferredHeight: 34\r