From aa7ee74781107bfa9ff772c8b08ec7fd9bfd75bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Bari?= <adaorcpp@gmail.com>
Date: Wed, 15 Oct 2025 16:44:41 +0200
Subject: [PATCH] fix: ignore windows for highligted menuitem styling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
---
 src/gui/tray/CurrentAccountHeaderButton.qml | 14 +++++++-------
 src/gui/tray/UserLine.qml                   |  8 ++++----
 theme/Style/Style.qml                       |  6 ------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/gui/tray/CurrentAccountHeaderButton.qml b/src/gui/tray/CurrentAccountHeaderButton.qml
index e944494ed5..ef47d1b61c 100644
--- a/src/gui/tray/CurrentAccountHeaderButton.qml
+++ b/src/gui/tray/CurrentAccountHeaderButton.qml
@@ -107,7 +107,7 @@ Button {
             readonly property real addAccountHorizontalOffset: ( (Style.accountAvatarSize - addAccountIconSize) / 2 ) + Style.accountIconsMenuMargin
             property var iconColor: !addAccountButton.enabled
                                     ? addAccountButton.palette.mid
-                                    : (addAccountButton.highlighted || addAccountButton.down
+                                    : ((addAccountButton.highlighted || addAccountButton.down) && Qt.platform.os !== "windows"
                                         ? addAccountButton.palette.highlightedText
                                         : addAccountButton.palette.text)
 
@@ -146,8 +146,8 @@ Button {
                 elide: Text.ElideRight
                 color: !parent.enabled
                     ? parent.palette.mid
-                    : (parent.highlighted || parent.down
-                        ? Style.contrastingColor( parent.palette.highlight )
+                    : ((parent.highlighted || parent.down) && Qt.platform.os !== "windows"
+                        ? parent.palette.highlightedText
                         : parent.palette.text)
             }
         }
@@ -170,8 +170,8 @@ Button {
                 elide: Text.ElideRight
                 color: !parent.enabled
                     ? parent.palette.mid
-                    : (parent.highlighted || parent.down
-                        ? Style.contrastingColor( parent.palette.highlight )
+                    : ((parent.highlighted || parent.down) && Qt.platform.os !== "windows"
+                        ? parent.palette.highlightedText
                         : parent.palette.text)
             }
         }
@@ -194,8 +194,8 @@ Button {
                 elide: Text.ElideRight
                 color: !parent.enabled
                     ? parent.palette.mid
-                    : (parent.highlighted || parent.down
-                        ? Style.contrastingColor( parent.palette.highlight )
+                    : ((parent.highlighted || parent.down) && Qt.platform.os !== "windows"
+                        ? parent.palette.highlightedText
                         : parent.palette.text)
             }
         }
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 5f0ad8e2f6..80b66a14e8 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -102,7 +102,7 @@ AbstractButton {
 
                     color: !userLine.parent.enabled
                         ? userLine.parent.palette.mid
-                        : (userLine.parent.highlighted || userLine.parent.down
+                        : ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
                             ? Style.contrastingColor( parent.palette.highlight )
                             : userLine.parent.palette.text)
                 }
@@ -117,7 +117,7 @@ AbstractButton {
 
                     color: !userLine.parent.enabled
                         ? userLine.parent.palette.mid
-                        : (userLine.parent.highlighted || userLine.parent.down
+                        : ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
                             ? userLine.parent.palette.highlightedText
                             : userLine.parent.palette.text)
                 }
@@ -134,7 +134,7 @@ AbstractButton {
 
                 color: !userLine.parent.enabled
                     ? userLine.parent.palette.mid
-                    : (userLine.parent.highlighted || userLine.parent.down
+                    : ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
                         ? Style.contrastingColor( parent.palette.highlight )
                         : userLine.parent.palette.text)
             }
@@ -158,7 +158,7 @@ AbstractButton {
 
             property var iconColor: !userLine.parent.enabled
                 ? userLine.parent.palette.mid
-                : (!hovered && (userLine.parent.highlighted || userLine.parent.down)
+                : (!hovered && ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows")
                     ? Style.contrastingColor( parent.palette.highlight )
                     : userLine.parent.palette.text)
             icon.source: "image://svgimage-custom-color/more.svg/" + iconColor
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 3f86f73c05..98856f8c8e 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -211,10 +211,4 @@ QtObject {
     function colorWithoutTransparency(color) {
         return Qt.rgba(color.r, color.g, color.b, 1)
     }
-
-    function contrastingColor(color) {
-        // sRGB relative luminance formula
-        const luminance = 0.299 * color.r + 0.587 * color.g + 0.114 * color.b
-        return luminance > 0.5 ? Qt.darker( color, 2.0 ) : Qt.lighter( color, 2.0 )
-    }
 }