diff --git a/Colors.js b/Colors.js index 122fb62..56bd1fb 100644 --- a/Colors.js +++ b/Colors.js @@ -1,18 +1,18 @@ const colors = { - base00: "#191724", - base01: "#1f1d2e", - base02: "#26233a", - base03: "#6e6a86", - base04: "#908caa", - base05: "#e0def4", - base06: "#e0def4", - base07: "#524f67", - base08: "#eb6f92", - base09: "#f6c177", - base0A: "#ebbcba", - base0B: "#31748f", - base0C: "#9ccfd8", - base0D: "#c4a7e7", - base0E: "#f6c177", - base0F: "#524f67", + 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", } diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml index 489e1d7..e6ebacc 100644 --- a/modules/bar/Ws.qml +++ b/modules/bar/Ws.qml @@ -4,35 +4,47 @@ import QtQuick import QtQuick.Layouts import qs import qs.widgets +import qs.settings BarComponent { id: root required property ShellScreen barScreen - implicitWidth: wsLayout.implicitWidth + wsLayout.spacing * 2 + implicitWidth: wsLayout.implicitWidth + 4 RowLayout { - id: wsLayout - spacing: 15 - anchors.centerIn: parent - Repeater { - model: WindowManager.screenProjection(root.barScreen).windowsets - delegate: Rectangle { - id: wsContainer - required property var modelData - visible: modelData.shouldDisplay - StyledText { - id: wsText - anchors.centerIn: parent - text: parent.modelData.name - color: parent.modelData.active ? Colors.base0D: Colors.base03 - MouseArea { - id: clickHandler - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - acceptedButtons: Qt.LeftButton - onClicked: parent.parent.modelData.activate() - } - } - } - } + id: wsLayout + anchors.centerIn: parent + spacing: 8 + Repeater { + model: WindowManager.screenProjection(root.barScreen).windowsets + delegate: Rectangle { + id: wsContainer + required property var modelData + visible: modelData.shouldDisplay + implicitWidth: modelData.active ? 50 : 20 + implicitHeight: Config.moduleHeight - 4 + color: modelData.active ? Colors.base0D : Colors.activeModuleBg + radius: Config.rounding + Behavior on implicitWidth { + PropertyAnimation { + duration: 350 + easing.type: Easing.InOutBack + easing.overshoot: 1.2 + } + } + MouseArea { + id: clickHandler + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + acceptedButtons: Qt.LeftButton + onClicked: wsContainer.modelData.activate() + } + StyledText { + id: wsText + anchors.centerIn: parent + text: parent.modelData.name + color: parent.modelData.active ? Colors.base00 : Colors.text + } + } + } } } diff --git a/settings/settings.ini b/settings/settings.ini index b0de28c..46cdedb 100644 --- a/settings/settings.ini +++ b/settings/settings.ini @@ -3,10 +3,10 @@ barHeight=30 floating=false font=Iosevka fontSize=16 -iconSize=12 +iconSize=18 opacity=1 primaryMon=eDP-1 rounding=16 showCorners=true wallDir=file:///home/lucy/.walls -wallpaper=@Variant(\0\0\0\x11\0\0\0\x1f/home/lucy/.walls/lain_blue.png) +wallpaper=@Variant(\0\0\0\x11\0\0\0\x1b/home/lucy/.walls/faris.png)