From 411ed72436c1337c9e59e81b93de1db1f6574b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Atoch?= Date: Wed, 23 Jul 2025 14:16:46 -0400 Subject: [PATCH] Fix some invalid colors name + avoid hard coding colors and transparency. --- Bar/Modules/CustomTrayMenu.qml | 6 +++--- Components/StyledTooltip.qml | 6 +++--- Settings/Theme.json | 4 ++-- Settings/Theme.qml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Bar/Modules/CustomTrayMenu.qml b/Bar/Modules/CustomTrayMenu.qml index ae60890..5366d7f 100644 --- a/Bar/Modules/CustomTrayMenu.qml +++ b/Bar/Modules/CustomTrayMenu.qml @@ -51,8 +51,8 @@ PopupWindow { Rectangle { id: bg anchors.fill: parent - color: Theme.backgroundElevated || "#222" - border.color: Theme.border || "#444" + color: Theme.surfaceVariant || "#222" + border.color: Theme.outline || "#444" border.width: 1 radius: 12 z: 0 @@ -84,7 +84,7 @@ PopupWindow { anchors.centerIn: parent width: parent.width - 20 height: 1 - color: Qt.darker(Theme.backgroundElevated || "#222", 1.4) + color: Qt.darker(Theme.surfaceVariant || "#222", 1.4) visible: modelData?.isSeparator ?? false } diff --git a/Components/StyledTooltip.qml b/Components/StyledTooltip.qml index 6fe0f12..49e6694 100644 --- a/Components/StyledTooltip.qml +++ b/Components/StyledTooltip.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick import QtQuick.Window 2.15 import qs.Settings @@ -57,8 +57,8 @@ Window { Rectangle { anchors.fill: parent radius: 6 - color: "#222" - border.color: Theme.backgroundTertiary || "#444" + color: Theme.backgroundTertiary || "#222" + border.color: Theme.outline || "#444" border.width: 1 opacity: 0.97 z: 1 diff --git a/Settings/Theme.json b/Settings/Theme.json index c20e7b1..0741df8 100644 --- a/Settings/Theme.json +++ b/Settings/Theme.json @@ -23,6 +23,6 @@ "onAccent": "#0E0F10", "outline": "#565758", - "shadow": "#0E0F10", - "overlay": "#0E0F10" + "shadow": "#B30E0F10", + "overlay": "#660E0F10" } diff --git a/Settings/Theme.qml b/Settings/Theme.qml index f825cef..d324c37 100644 --- a/Settings/Theme.qml +++ b/Settings/Theme.qml @@ -97,8 +97,8 @@ Singleton { property color outline: themeData.outline // Shadows & Overlays - property color shadow: applyOpacity(themeData.shadow, "B3") - property color overlay: applyOpacity(themeData.overlay, "66") + property color shadow: themeData.shadow + property color overlay: themeData.overlay // Font Properties property string fontFamily: "Roboto" // Family for all text