diff --git a/Colors.qml b/Colors.qml index 24bcc9c..c2c3ae2 100644 --- a/Colors.qml +++ b/Colors.qml @@ -3,24 +3,24 @@ import QtQuick QtObject { // --- The Backgrounds (Darkest to Lightest) --- - readonly property color base00: "#1c2023" // Default Background - readonly property color base01: "#393f45" // Lighter Background (Status bars, panels) - readonly property color base02: "#565e65" // Selection Background - readonly property color base03: "#747c84" // Comments, Invisibles, line highlighting + readonly property color base00: "#1e1e2e" // Default Background + readonly property color base01: "#181825" // Lighter Background (Status bars, panels) + readonly property color base02: "#313244" // Selection Background + readonly property color base03: "#45475a" // Comments, Invisibles, line highlighting // --- The Foregrounds (Darkest to Lightest) --- - readonly property color base04: "#adb3ba" // Dark Foreground (Used for status bars) - readonly property color base05: "#c7ccd1" // Default Foreground, Caret - readonly property color base06: "#dfe2e5" // Light Foreground (Rarely used) - readonly property color base07: "#f3f4f5" // Lightest Foreground + readonly property color base04: "#585b70" // Dark Foreground (Used for status bars) + readonly property color base05: "#cdd6f4" // Default Foreground, Caret + readonly property color base06: "#f5e0dc" // Light Foreground (Rarely used) + readonly property color base07: "#b4befe" // Lightest Foreground // --- The Accent Colors --- - readonly property color base08: "#c7ae95" // Red (Variables, errors) - readonly property color base09: "#c7c795" // Orange (Integers, booleans, constants) - readonly property color base0A: "#aec795" // Yellow (Classes, search text bg, warnings) - readonly property color base0B: "#95c7ae" // Green (Strings, success states) - readonly property color base0C: "#95aec7" // Cyan (Support, regex, escape chars) - readonly property color base0D: "#ae95c7" // Blue (Functions, methods, headings) - readonly property color base0E: "#c795ae" // Purple/Mauve (Keywords, storage, selectors) - readonly property color base0F: "#c79595" // Brown/Flamingo (Deprecated, embedded tags) + readonly property color base08: "#f38ba8" // Red (Variables, errors) + readonly property color base09: "#fab387" // Orange (Integers, booleans, constants) + readonly property color base0A: "#f9e2af" // Yellow (Classes, search text bg, warnings) + readonly property color base0B: "#a6e3a1" // Green (Strings, success states) + readonly property color base0C: "#94e2d5" // Cyan (Support, regex, escape chars) + readonly property color base0D: "#89b4fa" // Blue (Functions, methods, headings) + readonly property color base0E: "#cba6f7" // Purple/Mauve (Keywords, storage, selectors) + readonly property color base0F: "#f2cdcd" // Brown/Flamingo (Deprecated, embedded tags) } diff --git a/modules/bar/ActiveWindow.qml b/modules/bar/ActiveWindow.qml index 8a1684d..39e8ede 100644 --- a/modules/bar/ActiveWindow.qml +++ b/modules/bar/ActiveWindow.qml @@ -21,7 +21,7 @@ Rectangle { color: 'transparent' clip: true StyledText { - property bool onWs: Hyprland.activeToplevel.workspace == Hyprland.focusedWorkspace + property bool onWs: Hyprland.activeToplevel?.workspace == Hyprland.focusedWorkspace text: onWs ? Hyprland.activeToplevel?.title ?? "Desktop" : "Desktop" elide: Text.ElideRight } diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml index dd2c8d7..b9ddf24 100644 --- a/modules/bar/Ws.qml +++ b/modules/bar/Ws.qml @@ -29,7 +29,6 @@ Rectangle { model: Hyprland.workspaces delegate: Rectangle { id: wsWrapper - anchors.verticalCenter: parent.verticalCenter implicitHeight: root.moduleHeight - 4 implicitWidth: modelData.active ? 48 : 24 parent: wsLayout diff --git a/settings/settings.ini b/settings/settings.ini index 53e9485..2967741 100644 --- a/settings/settings.ini +++ b/settings/settings.ini @@ -4,4 +4,4 @@ font=Google Sans fontSize=14 opacity=1 roudning=16 -wallpaper=@Variant(\0\0\0\x11\0\0\0)file:///home/lucy/.wall/walkingcastle.png) +wallpaper=@Variant(\0\0\0\x11\0\0\0\"file:///home/lucy/.walls/mooon.png)