lucy/quickshell
Watch
1
0
Fork
You've already forked quickshell
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup ws styling

Browse source
This commit is contained in:
lucy 2026-08-26 21:12:03 +02:00
commit b329303ee1
5 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Colors.js
View file

@ -1,18 +1,18 @@
const colors = { const colors = {
base00: "#282828", base00: "#24273a",
base01: "#3c3836", base01: "#1e2030",
base02: "#504945", base02: "#363a4f",
base03: "#665c54", base03: "#494d64",
base04: "#928374", base04: "#5b6078",
base05: "#ebdbb2", base05: "#cad3f5",
base06: "#fbf1c7", base06: "#f4dbd6",
base07: "#f9f5d7", base07: "#b7bdf8",
base08: "#cc241d", base08: "#ed8796",
base09: "#d65d0e", base09: "#f5a97f",
base0A: "#d79921", base0A: "#eed49f",
base0B: "#98971a", base0B: "#a6da95",
base0C: "#689d6a", base0C: "#8bd5ca",
base0D: "#458588", base0D: "#8aadf4",
base0E: "#b16286", base0E: "#c6a0f6",
base0F: "#9d0006", base0F: "#f0c6c6",
} }

8
Colors.qml
View file

@ -2,14 +2,16 @@ pragma ComponentBehavior: Bound
pragma Singleton pragma Singleton
import QtQuick import QtQuick
import Quickshell import Quickshell
import qs.settings
import "Colors.js" as Colors import "Colors.js" as Colors
Singleton { Singleton {
id: root id: root
readonly property color accent: base0D readonly property color accent: base0D
readonly property color barBg: base01 readonly property color rootBarColor: base01
readonly property color moduleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.05, 1.0) readonly property color barBg: Qt.rgba(rootBarColor.r,rootBarColor.g,rootBarColor.b,Config.opacity)
readonly property color activeModuleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.1, 1.0) 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 text: Qt.lighter(base00, 7)
readonly property color base00: Colors.colors.base00 readonly property color base00: Colors.colors.base00
readonly property color base01: Colors.colors.base01 readonly property color base01: Colors.colors.base01

11
modules/bar/Bar.qml
View file

@ -3,7 +3,6 @@ import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import qs.modules.wallpaper import qs.modules.wallpaper
import qs.settings import qs.settings
import qs.widgets
import qs import qs
Variants { Variants {
@ -19,11 +18,15 @@ Variants {
} }
color: 'transparent' color: 'transparent'
implicitHeight: Config.barHeight implicitHeight: Config.barHeight
margins.top: Config.floating ? 10 : 0
margins.left: Config.floating ? 10 : 0
margins.right: Config.floating ? 10 : 0
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: Colors.barBg color: Colors.barBg
radius: Config.floating ? Config.rounding : 0
RowLayout { RowLayout {
anchors.leftMargin: 10 anchors.leftMargin: 4
anchors.left: parent.left anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Ws { Ws {
@ -36,7 +39,7 @@ Variants {
Date {} Date {}
} }
RowLayout { RowLayout {
anchors.rightMargin: 10 anchors.rightMargin: 4
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Mpris {} Mpris {}
@ -48,7 +51,7 @@ Variants {
} }
Pw {} Pw {}
Netstatus {} Netstatus {}
} }
} }
} }

4
modules/bar/Ws.qml
View file

@ -13,7 +13,7 @@ BarComponent {
RowLayout { RowLayout {
id: wsLayout id: wsLayout
anchors.centerIn: parent anchors.centerIn: parent
spacing: 8 spacing: 0
Repeater { Repeater {
model: WindowManager.screenProjection(root.barScreen).windowsets model: WindowManager.screenProjection(root.barScreen).windowsets
delegate: Rectangle { delegate: Rectangle {
@ -22,7 +22,7 @@ BarComponent {
visible: modelData.shouldDisplay visible: modelData.shouldDisplay
implicitWidth: modelData.active ? 50 : 20 implicitWidth: modelData.active ? 50 : 20
implicitHeight: Config.moduleHeight - 4 implicitHeight: Config.moduleHeight - 4
color: modelData.active ? Colors.base0D : Colors.activeModuleBg color: modelData.active ? Colors.base0D : Colors.moduleBg
radius: Config.rounding radius: Config.rounding
Behavior on implicitWidth { Behavior on implicitWidth {
PropertyAnimation { PropertyAnimation {

4
settings/settings.ini
View file

@ -1,6 +1,6 @@
[General] [General]
barHeight=30 barHeight=30
floating=false floating=true
font=Iosevka font=Iosevka
fontSize=16 fontSize=16
iconSize=18 iconSize=18
@ -9,4 +9,4 @@ primaryMon=eDP-1
rounding=16 rounding=16
showCorners=true showCorners=true
wallDir=file:///home/lucy/.walls 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)