diff --git a/Colors.qml b/Colors.qml index c23b961..24bcc9c 100644 --- a/Colors.qml +++ b/Colors.qml @@ -3,24 +3,24 @@ import QtQuick QtObject { // --- The Backgrounds (Darkest to Lightest) --- - readonly property color base00: "#1d2021" // Default Background - readonly property color base01: "#3c3836" // Lighter Background (Status bars, panels) - readonly property color base02: "#504945" // Selection Background - readonly property color base03: "#665c54" // Comments, Invisibles, line highlighting + 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 // --- The Foregrounds (Darkest to Lightest) --- - readonly property color base04: "#bdae93" // Dark Foreground (Used for status bars) - readonly property color base05: "#d5c4a1" // Default Foreground, Caret - readonly property color base06: "#ebdbb2" // Light Foreground (Rarely used) - readonly property color base07: "#fbf1c7" // Lightest Foreground + 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 // --- The Accent Colors --- - readonly property color base08: "#fb4934" // Red (Variables, errors) - readonly property color base09: "#fe8019" // Orange (Integers, booleans, constants) - readonly property color base0A: "#fabd2f" // Yellow (Classes, search text bg, warnings) - readonly property color base0B: "#b8bb26" // Green (Strings, success states) - readonly property color base0C: "#8ec07c" // Cyan (Support, regex, escape chars) - readonly property color base0D: "#83a598" // Blue (Functions, methods, headings) - readonly property color base0E: "#d3869b" // Purple/Mauve (Keywords, storage, selectors) - readonly property color base0F: "#d65d0e" // Brown/Flamingo (Deprecated, embedded tags) + 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) } diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml index 4f8abb0..dd2c8d7 100644 --- a/modules/bar/Ws.qml +++ b/modules/bar/Ws.qml @@ -15,7 +15,7 @@ Rectangle { property HyprlandMonitor hyprBarScreen: Hyprland.monitorFor(root.barScreen) radius: Config.rounding color: Colors.base01 - implicitWidth: wsLayout.implicitWidth + implicitWidth: wsLayout.implicitWidth implicitHeight: moduleHeight RowLayout { @@ -31,7 +31,7 @@ Rectangle { id: wsWrapper anchors.verticalCenter: parent.verticalCenter implicitHeight: root.moduleHeight - 4 - implicitWidth: modelData.active ? 48 : 32 + implicitWidth: modelData.active ? 48 : 24 parent: wsLayout color: modelData.active ? Colors.base0D : Colors.base01 radius: Config.rounding @@ -42,6 +42,14 @@ Rectangle { text: wsWrapper.modelData.id color: parent.modelData.active ? Colors.base00 : Colors.base07 } + Behavior on implicitWidth { + NumberAnimation { + easing.type: Easing.InOutBack + easing.amplitude: 2 + duration: 400 + easing.overshoot: 2 + } + } MouseArea { id: clickHandler anchors.fill: parent