diff --git a/Colors.js b/Colors.js index 56bd1fb..9685104 100644 --- a/Colors.js +++ b/Colors.js @@ -1,18 +1,18 @@ const colors = { - base00: "#282828", - base01: "#3c3836", - base02: "#504945", - base03: "#665c54", - base04: "#928374", - base05: "#ebdbb2", - base06: "#fbf1c7", - base07: "#f9f5d7", - base08: "#cc241d", - base09: "#d65d0e", - base0A: "#d79921", - base0B: "#98971a", - base0C: "#689d6a", - base0D: "#458588", - base0E: "#b16286", - base0F: "#9d0006", + base00: "#24273a", + base01: "#1e2030", + base02: "#363a4f", + base03: "#494d64", + base04: "#5b6078", + base05: "#cad3f5", + base06: "#f4dbd6", + base07: "#b7bdf8", + base08: "#ed8796", + base09: "#f5a97f", + base0A: "#eed49f", + base0B: "#a6da95", + base0C: "#8bd5ca", + base0D: "#8aadf4", + base0E: "#c6a0f6", + base0F: "#f0c6c6", } diff --git a/Colors.qml b/Colors.qml index e6a24ad..e29d19e 100644 --- a/Colors.qml +++ b/Colors.qml @@ -2,14 +2,16 @@ pragma ComponentBehavior: Bound pragma Singleton import QtQuick import Quickshell +import qs.settings import "Colors.js" as Colors Singleton { id: root readonly property color accent: base0D - readonly property color barBg: base01 - readonly property color moduleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.05, 1.0) - readonly property color activeModuleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.1, 1.0) + 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 text: Qt.lighter(base00, 7) readonly property color base00: Colors.colors.base00 readonly property color base01: Colors.colors.base01 diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 324fe04..37efff2 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts import qs.modules.wallpaper import qs.settings -import qs.widgets import qs Variants { @@ -19,11 +18,15 @@ Variants { } color: 'transparent' implicitHeight: Config.barHeight + margins.top: Config.floating ? 10 : 0 + margins.left: Config.floating ? 10 : 0 + margins.right: Config.floating ? 10 : 0 Rectangle { anchors.fill: parent color: Colors.barBg + radius: Config.floating ? Config.rounding : 0 RowLayout { - anchors.leftMargin: 10 + anchors.leftMargin: 4 anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter Ws { @@ -36,7 +39,7 @@ Variants { Date {} } RowLayout { - anchors.rightMargin: 10 + anchors.rightMargin: 4 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter Mpris {} @@ -48,7 +51,7 @@ Variants { } Pw {} - Netstatus {} + Netstatus {} } } } diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml index e6ebacc..9272a9c 100644 --- a/modules/bar/Ws.qml +++ b/modules/bar/Ws.qml @@ -13,7 +13,7 @@ BarComponent { RowLayout { id: wsLayout anchors.centerIn: parent - spacing: 8 + spacing: 0 Repeater { model: WindowManager.screenProjection(root.barScreen).windowsets delegate: Rectangle { @@ -22,7 +22,7 @@ BarComponent { visible: modelData.shouldDisplay implicitWidth: modelData.active ? 50 : 20 implicitHeight: Config.moduleHeight - 4 - color: modelData.active ? Colors.base0D : Colors.activeModuleBg + color: modelData.active ? Colors.base0D : Colors.moduleBg radius: Config.rounding Behavior on implicitWidth { PropertyAnimation { diff --git a/settings/settings.ini b/settings/settings.ini index 46cdedb..c3c021d 100644 --- a/settings/settings.ini +++ b/settings/settings.ini @@ -1,6 +1,6 @@ [General] barHeight=30 -floating=false +floating=true font=Iosevka fontSize=16 iconSize=18 @@ -9,4 +9,4 @@ primaryMon=eDP-1 rounding=16 showCorners=true wallDir=file:///home/lucy/.walls -wallpaper=@Variant(\0\0\0\x11\0\0\0\x1b/home/lucy/.walls/faris.png) +wallpaper=@Variant(\0\0\0\x11\0\0\0\x1f/home/lucy/.walls/lain_blue.png)