From b938dd76f06791e4e4acaf9700984b970f7d9130 Mon Sep 17 00:00:00 2001 From: bbedward Date: Thu, 8 Oct 2026 16:20:30 -0400 Subject: [PATCH] theme: use blend helpers from qml-common --- dank-qml-common | 2 +- flake.lock | 6 +++--- quickshell/Common/Theme.qml | 8 ++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dank-qml-common b/dank-qml-common index 59d71ecf2..6b5d581d2 160000 --- a/dank-qml-common +++ b/dank-qml-common @@ -1 +1 @@ -Subproject commit 59d71ecf2cb9dc4002c7da7c419c5329d6d29d9b +Subproject commit 6b5d581d2fbe9f36f600d904c74e38fd377cb558 diff --git a/flake.lock b/flake.lock index e68a31244..5889e86c6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dank-qml-common": { "flake": false, "locked": { - "lastModified": 1791478817, - "narHash": "sha256-V5s6Zatru7+YPb5n67CpEh64f1LDfV1iP8DmYnqRd0c=", + "lastModified": 1791490464, + "narHash": "sha256-YAYbG0BCHqxK3Dd511pH1v1dIGGwfF6sQit/PlWJAAY=", "owner": "AvengeMedia", "repo": "dank-qml-common", - "rev": "59d71ecf2cb9dc4002c7da7c419c5329d6d29d9b", + "rev": "6b5d581d2fbe9f36f600d904c74e38fd377cb558", "type": "github" }, "original": { diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml index 53cadf3f8..8fad95192 100644 --- a/quickshell/Common/Theme.qml +++ b/quickshell/Common/Theme.qml @@ -2195,15 +2195,11 @@ Singleton { } function withAlpha(c, a) { - if (!c || c.r === undefined) - return Qt.rgba(0, 0, 0, 0); - return Qt.rgba(c.r, c.g, c.b, a); + return DCommon.Style.withAlpha(c, a); } function blendAlpha(c, a) { - if (!c || c.r === undefined) - return Qt.rgba(0, 0, 0, 0); - return Qt.rgba(c.r, c.g, c.b, c.a * a); + return DCommon.Style.blendAlpha(c, a); } function hoverTint(base) {