diff --git a/Colors.qml b/Colors.qml index 6f027d6..9fe1866 100644 --- a/Colors.qml +++ b/Colors.qml @@ -7,35 +7,56 @@ import qs.settings Singleton { id: root - property alias c: colors - property color accent: colors[Config.cfg.appearance.accent] - property string font: colors.base06 + property alias c: colorsProxy + property string font: colorsProxy.base06 + property string accent: colorsProxy[Config.cfg.appearance.accent] + QtObject { + id: colorsProxy + property string base00: "#" + colors.base00 + property string base01: "#" + colors.base01 + property string base02: "#" + colors.base02 + property string base03: "#" + colors.base03 + property string base04: "#" + colors.base04 + property string base05: "#" + colors.base05 + property string base06: "#" + colors.base06 + property string base07: "#" + colors.base07 + property string base08: "#" + colors.base08 + property string base09: "#" + colors.base09 + property string base0A: "#" + colors.base0A + property string base0B: "#" + colors.base0B + property string base0C: "#" + colors.base0C + property string base0D: "#" + colors.base0D + property string base0E: "#" + colors.base0E + property string base0F: "#" + colors.base0F + + + } FileView { id: colorView - path: Qt.resolvedUrl(Quickshell.shellDir + "/schemes/" + Config.cfg.appearance.currentTheme) + path: Qt.resolvedUrl("/home/lucy/.config/stylix/palette.json") onFileChanged: { reload(); } - watchChanges: true + watchChanges: true adapter: JsonAdapter { id: colors - property color base00 - property color base01 - property color base02 - property color base03 - property color base04 - property color base05 - property color base06 - property color base07 - property color base08 - property color base09 - property color base0A - property color base0B - property color base0C - property color base0D - property color base0E - property color base0F + property string base00 + property string base01 + property string base02 + property string base03 + property string base04 + property string base05 + property string base06 + property string base07 + property string base08 + property string base09 + property string base0A + property string base0B + property string base0C + property string base0D + property string base0E + property string base0F } } } diff --git a/modules/applets/VolPopup.qml b/modules/applets/VolPopup.qml index 1d2d463..cdbd73e 100644 --- a/modules/applets/VolPopup.qml +++ b/modules/applets/VolPopup.qml @@ -12,7 +12,7 @@ import QtQuick.Controls Rectangle { id: root - color: Colors.c.base01 + color: Colors.c.base00 radius: Config.cfg.appearance.rounding - 4 implicitWidth: audioLayout.implicitWidth + 10 implicitHeight: audioLayout.implicitHeight + 10 diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index dd1d028..38d3476 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -25,11 +25,11 @@ Variants { Rectangle { color: Colors.c.base00 radius: Config.cfg.bar.floating ? Config.cfg.appearance.rounding : 0 - anchors.fill: parent - implicitHeight: parent.height - anchors.centerIn: parent + anchors.fill: parent + implicitHeight: parent.height + anchors.centerIn: parent RowLayout { - anchors.leftMargin: 4 + anchors.leftMargin: 4 anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter Ws { @@ -42,12 +42,9 @@ Variants { RowLayout { anchors.centerIn: parent Date {} - ColorPickerButton { - barScreen: root.modelData - } } RowLayout { - anchors.rightMargin: 4 + anchors.rightMargin: 4 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter Mpris { diff --git a/settings/settings.json b/settings/settings.json index 3a118c1..4b8cb84 100644 --- a/settings/settings.json +++ b/settings/settings.json @@ -1,7 +1,7 @@ { "appearance": { "accent": "base0D", - "currentTheme": "base16-gruvbox-dark-hard.json", + "currentTheme": "base16-gruvbox-dark.json", "font": "Inter", "fontSize": 14, "iconSize": 16, @@ -14,6 +14,6 @@ }, "wallpaper": { "wallDir": "/home/lucy/.walls/", - "wallpaper": "/home/lucy/.walls/lain_room.png" + "wallpaper": "/home/lucy/.walls/walkingcastle.png" } } diff --git a/widgets/BarComponent.qml b/widgets/BarComponent.qml index 0a231e3..5805974 100644 --- a/widgets/BarComponent.qml +++ b/widgets/BarComponent.qml @@ -4,7 +4,7 @@ import qs import qs.settings Rectangle { - property color base: Qt.rgba(Colors.accent.r, Colors.accent.g, Colors.accent.b, active ? 0.3 : 0.17) + property color base: active ? Colors.c.base02 : Colors.c.base01 property bool active: false color: base implicitHeight: Config.cfg.bar.height - 8 diff --git a/widgets/StyledSlider.qml b/widgets/StyledSlider.qml index 93022d2..10cf0b2 100644 --- a/widgets/StyledSlider.qml +++ b/widgets/StyledSlider.qml @@ -15,7 +15,7 @@ Slider { width: control.availableWidth height: implicitHeight radius: 2 - color: Colors.c.base01 + color: Colors.c.base00 Rectangle { width: control.visualPosition * parent.width