From 50a9a62a2d49db0f13e2f8a976eff861be47d7ef Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 28 Aug 2026 16:41:19 +0200 Subject: [PATCH] push --- Colors.qml | 4 ++-- modules/Services/Network.qml | 2 +- modules/applets/VolPopup.qml | 9 +++++++++ modules/bar/Date.qml | 2 +- modules/bar/Netstatus.qml | 3 +-- modules/bar/Ws.qml | 2 +- settings/settings.json | 6 +++--- widgets/StyledIcon.qml | 21 ++++++++++++++++----- 8 files changed, 34 insertions(+), 15 deletions(-) diff --git a/Colors.qml b/Colors.qml index e29d19e..ad83d3e 100644 --- a/Colors.qml +++ b/Colors.qml @@ -10,8 +10,8 @@ Singleton { readonly property color accent: base0D readonly property color rootBarColor: base01 readonly property color barBg: Qt.rgba(rootBarColor.r,rootBarColor.g,rootBarColor.b,Config.opacity) - readonly property color moduleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.2, Config.opacity) - readonly property color activeModuleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.4, Config.opacity) + readonly property color moduleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.15, Config.opacity) + readonly property color activeModuleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.2, Config.opacity) readonly property color text: Qt.lighter(base00, 7) readonly property color base00: Colors.colors.base00 readonly property color base01: Colors.colors.base01 diff --git a/modules/Services/Network.qml b/modules/Services/Network.qml index db01a33..b79cd1c 100644 --- a/modules/Services/Network.qml +++ b/modules/Services/Network.qml @@ -13,7 +13,7 @@ Singleton { function getWiredIcon() { if (wiredDev?.hasLink ?? false) { if (wiredDev.connected ?? false) { - return "network-wired-activated"; + return "network-wired"; } else return "network-wired-unavailable"; } else diff --git a/modules/applets/VolPopup.qml b/modules/applets/VolPopup.qml index 55af4dd..4aba62c 100644 --- a/modules/applets/VolPopup.qml +++ b/modules/applets/VolPopup.qml @@ -16,9 +16,18 @@ PopupWindow { anchor.margins.top: 40 color: 'transparent' grabFocus: true + Rectangle { id: root + Keys.onEscapePressed: { + parent.visible = false; + } + onVisibleChanged: { + if (parent.visible) + forceActiveFocus(); + } anchors.fill: parent + anchors.centerIn: parent color: Colors.barBg radius: Config.cfg.appearance.rounding ColumnLayout { diff --git a/modules/bar/Date.qml b/modules/bar/Date.qml index 4dc91cf..631cff6 100644 --- a/modules/bar/Date.qml +++ b/modules/bar/Date.qml @@ -19,7 +19,7 @@ BarComponent { id: clockLayout anchors.centerIn: parent StyledIcon { - iconName: "clock-alt-symbolic" + iconName: "clock-large" } StyledText { id: clockText diff --git a/modules/bar/Netstatus.qml b/modules/bar/Netstatus.qml index 25d0745..79331e3 100644 --- a/modules/bar/Netstatus.qml +++ b/modules/bar/Netstatus.qml @@ -13,8 +13,7 @@ BarComponent { StyledIcon { iconName: Network.getWifiIcon() } - StyledIcon { - Layout.topMargin: 2 + StyledIcon { iconName: Network.getWiredIcon() visible: Network.wiredDev != null } diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml index 18e92cc..62029c6 100644 --- a/modules/bar/Ws.qml +++ b/modules/bar/Ws.qml @@ -21,7 +21,7 @@ BarComponent { id: wsContainer required property var modelData visible: modelData.shouldDisplay - implicitWidth: modelData.active ? 50 : 20 + implicitWidth: modelData.active ? root.implicitHeight * 2.2 : root.implicitHeight color: modelData.active ? Colors.base0D : Colors.moduleBg Behavior on implicitWidth { PropertyAnimation { diff --git a/settings/settings.json b/settings/settings.json index 5f9ba28..3595180 100644 --- a/settings/settings.json +++ b/settings/settings.json @@ -2,16 +2,16 @@ "appearance": { "font": "Iosevka", "fontSize": 14, - "iconSize": 14, + "iconSize": 22, "rounding": 16 }, "bar": { "floating": true, - "height": 30, + "height": 34, "opacity": 1 }, "wallpaper": { "wallDir": "/home/lucy/.walls/", - "wallpaper": "/home/lucy/.walls/lain_blue.png" + "wallpaper": "/home/lucy/.walls/frierensuff.png" } } diff --git a/widgets/StyledIcon.qml b/widgets/StyledIcon.qml index 8b53f7e..17aac70 100644 --- a/widgets/StyledIcon.qml +++ b/widgets/StyledIcon.qml @@ -1,18 +1,29 @@ import Quickshell import Quickshell.Widgets +import QtQuick import QtQuick.Effects import qs import qs.settings -IconImage { + +Image { + id: root required property string iconName - implicitSize: Config.cfg.appearance.iconSize source: Quickshell.iconPath(iconName) + width: Config.cfg.appearance.iconSize + height: Config.cfg.appearance.iconSize + sourceSize.width: Config.cfg.appearance.iconSize + sourceSize.height: Config.cfg.appearance.iconSize + fillMode: Image.PreserveAspectFit + smooth: true mipmap: true + layer.enabled: true + layer.smooth: true + layer.textureSize: Qt.size(width * 4, height * 4) layer.effect: MultiEffect { - colorization: 1.0 - colorizationColor: Colors.text - brightness: 1.0 + colorization: 1.0 + colorizationColor: Colors.text + brightness: 1.0 } }