From 0052b00904803e40e0476e551ba753dc50dde3c5 Mon Sep 17 00:00:00 2001 From: kossLAN Date: Mon, 25 Aug 2025 19:21:42 -0400 Subject: [PATCH] fix: colors on notifs and launcher --- shell/ShellSettings.qml | 1 - shell/bar/Bar.qml | 2 +- shell/launcher/Controller.qml | 20 ++++++++++---------- shell/notifications/ActiveToast.qml | 19 ++++++++----------- shell/notifications/Controller.qml | 4 ---- 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/shell/ShellSettings.qml b/shell/ShellSettings.qml index 133e16d..7ce7d3a 100644 --- a/shell/ShellSettings.qml +++ b/shell/ShellSettings.qml @@ -14,7 +14,6 @@ Singleton { property color surface_container: Qt.rgba(0.25, 0.25, 0.25, 1.0) property color surface_container_translucent: Qt.rgba(0.25, 0.25, 0.25, 0.25) property color highlight: Qt.rgba(1.0, 1.0, 1.0, 0.85) - // property color primary: "#2EADC6" property color active: Qt.rgba(1.0, 1.0, 1.0, 1.0) property color active_translucent: Qt.rgba(1.0, 1.0, 1.0, 0.15) property color border_translucent: Qt.rgba(1.0, 1.0, 1.0, 0.05) diff --git a/shell/bar/Bar.qml b/shell/bar/Bar.qml index 85c220d..f987654 100644 --- a/shell/bar/Bar.qml +++ b/shell/bar/Bar.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import "power" -// import "volume" +import "volume" import "systray" // import qs.widgets import qs diff --git a/shell/launcher/Controller.qml b/shell/launcher/Controller.qml index b7cbab7..3a24e00 100644 --- a/shell/launcher/Controller.qml +++ b/shell/launcher/Controller.qml @@ -40,12 +40,12 @@ Singleton { implicitHeight: 7 + searchContainer.implicitHeight + list.topMargin * 2 + list.delegateHeight * 10 color: "transparent" WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive - WlrLayershell.namespace: "shell:launcher" + // WlrLayershell.namespace: "shell:launcher" Rectangle { id: container - color: ShellSettings.colors["surface"] - radius: 18 + color: ShellSettings.colors.surface_translucent + radius: 12 anchors { fill: parent @@ -70,9 +70,9 @@ Singleton { id: searchContainer Layout.fillWidth: true implicitHeight: searchbox.implicitHeight + 15 - radius: 10 - color: ShellSettings.colors["surface_container"] - border.color: ShellSettings.colors["secondary"] + radius: 6 + color: ShellSettings.colors.surface_container_translucent + border.color: ShellSettings.colors.border_translucent RowLayout { id: searchbox @@ -82,7 +82,7 @@ Singleton { TextInput { id: search Layout.fillWidth: true - color: ShellSettings.colors["inverse_surface"] + color: ShellSettings.colors.highlight focus: true Keys.forwardTo: [list] @@ -255,8 +255,8 @@ Singleton { } highlight: Rectangle { - radius: 12 - color: ShellSettings.colors["primary"] + radius: 6 + color: ShellSettings.colors.active_translucent } keyNavigationEnabled: true @@ -297,7 +297,7 @@ Singleton { } Text { text: modelData.name - color: ShellSettings.colors["inverse_surface"] + color: ShellSettings.colors.active Layout.alignment: Qt.AlignVCenter } } diff --git a/shell/notifications/ActiveToast.qml b/shell/notifications/ActiveToast.qml index 0816308..6f42c84 100644 --- a/shell/notifications/ActiveToast.qml +++ b/shell/notifications/ActiveToast.qml @@ -3,9 +3,8 @@ import QtQuick.Layouts import Quickshell import Quickshell.Widgets import Quickshell.Services.Notifications -import "../widgets/" as Widgets -import ".." -import "../.." +import qs +import qs.widgets Item { id: root @@ -16,10 +15,10 @@ Item { width: parent.width height: Math.min(row.implicitHeight + 30, 400) - Rectangle { + StyledRectangle { id: container radius: 10 - color: ShellSettings.colors["surface_container"] + color: ShellSettings.colors.surface_translucent anchors.fill: parent Item { @@ -110,7 +109,7 @@ Item { Text { id: appName text: root.notification.appName - color: ShellSettings.colors["inverse_surface"] + color: ShellSettings.colors.active font.pointSize: 11 font.bold: true elide: Text.ElideRight @@ -119,12 +118,10 @@ Item { Layout.maximumWidth: topRow.width * 0.3 } - Widgets.Separator {} - Text { id: summaryText text: root.notification.summary - color: ShellSettings.colors["inverse_surface"] + color: ShellSettings.colors.active font.pointSize: 11 elide: Text.ElideRight maximumLineCount: 1 @@ -156,7 +153,7 @@ Item { ctx.beginPath(); ctx.arc(centerX, centerY, radius, -Math.PI / 2, -Math.PI / 2 + 2 * Math.PI * progress); - ctx.strokeStyle = ShellSettings.colors["primary"]; + ctx.strokeStyle = ShellSettings.colors.highlight ctx.lineWidth = 2; ctx.stroke(); } @@ -204,7 +201,7 @@ Item { Text { id: bodyText text: root.notification.body - color: ShellSettings.colors["inverse_surface"] + color: ShellSettings.colors.active font.pointSize: 11 wrapMode: Text.Wrap elide: Text.ElideRight diff --git a/shell/notifications/Controller.qml b/shell/notifications/Controller.qml index f325439..de7f5de 100644 --- a/shell/notifications/Controller.qml +++ b/shell/notifications/Controller.qml @@ -53,10 +53,6 @@ Scope { right: true } - Text { - text: "length: " + notificationWindow.visibleCount - } - ColumnLayout { id: notifLayout spacing: 15