From c9484d4448b9cf34a52dae378d7fc3747b5e4fd8 Mon Sep 17 00:00:00 2001
From: Ly-sec <itslysec@gmail.com>
Date: Sun, 17 Aug 2025 22:01:56 +0200
Subject: [PATCH] Possible TrayMenu text fix

---
 Modules/Bar/TrayMenu.qml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/Bar/TrayMenu.qml b/Modules/Bar/TrayMenu.qml
index 50c61c0..1e4bccf 100644
--- a/Modules/Bar/TrayMenu.qml
+++ b/Modules/Bar/TrayMenu.qml
@@ -126,7 +126,7 @@ PopupWindow {
             id: text
             Layout.fillWidth: true
             color: (modelData?.enabled
-                    ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.textDisabled
+                    ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOnSurfaceVariant
             text: modelData?.text ?? ""
             font.pointSize: Style.fontSizeSmall * scaling
             verticalAlignment: Text.AlignVCenter
@@ -148,7 +148,7 @@ PopupWindow {
             font.pointSize: Style.fontSizeSmall * scaling
             verticalAlignment: Text.AlignVCenter
             visible: modelData?.hasChildren ?? false
-            color: Color.mOnSurface
+            color: (modelData?.enabled ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOnSurfaceVariant
           }
         }
 
@@ -350,7 +350,6 @@ PopupWindow {
             color: mouseArea.containsMouse ? Color.mTertiary : Color.transparent
             radius: Style.radiusSmall * scaling
             visible: !(modelData?.isSeparator ?? false)
-            property color hoverTextColor: mouseArea.containsMouse ? Color.mOnSurface : Color.mOnSurface
 
             RowLayout {
               anchors.fill: parent
@@ -361,7 +360,7 @@ PopupWindow {
               NText {
                 id: subText
                 Layout.fillWidth: true
-                color: (modelData?.enabled ?? true) ? bg.hoverTextColor : Color.textDisabled
+                color: (modelData?.enabled ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOnSurfaceVariant
                 text: modelData?.text ?? ""
                 font.pointSize: Style.fontSizeSmall * scaling
                 verticalAlignment: Text.AlignVCenter
@@ -383,6 +382,7 @@ PopupWindow {
                 font.pointSize: Style.fontSizeSmall * scaling
                 verticalAlignment: Text.AlignVCenter
                 visible: modelData?.hasChildren ?? false
+                color: (modelData?.enabled ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOnSurfaceVariant
               }
             }