Compare commits

..

No commits in common. "e96ddbef65ed5c804108ec2ff943163fef38c4fe" and "d3b1789b99684ce344c1c208cda92e40a9468aa0" have entirely different histories.

10 changed files with 169 additions and 181 deletions

View File

@ -3,24 +3,24 @@ import QtQuick
QtObject { QtObject {
// --- The Backgrounds (Darkest to Lightest) --- // --- The Backgrounds (Darkest to Lightest) ---
readonly property string base00: "#1d2021" // Default Background readonly property string base00: "#1d1f21" // Default Background
readonly property string base01: "#3c3836" // Lighter Background (Status bars, panels) readonly property string base01: "#282a2e" // Lighter Background (Status bars, panels)
readonly property string base02: "#504945" // Selection Background readonly property string base02: "#373b41" // Selection Background
readonly property string base03: "#665c54" // Comments, Invisibles, line highlighting readonly property string base03: "#969896" // Comments, Invisibles, line highlighting
// --- The Foregrounds (Darkest to Lightest) --- // --- The Foregrounds (Darkest to Lightest) ---
readonly property string base04: "#bdae93" // Dark Foreground (Used for status bars) readonly property string base04: "#b4b7b4" // Dark Foreground (Used for status bars)
readonly property string base05: "#d5c4a1" // Default Foreground, Caret readonly property string base05: "#c5c8c6" // Default Foreground, Caret
readonly property string base06: "#ebdbb2" // Light Foreground (Rarely used) readonly property string base06: "#e0e0e0" // Light Foreground (Rarely used)
readonly property string base07: "#fbf1c7" // Lightest Foreground readonly property string base07: "#ffffff" // Lightest Foreground
// --- The Accent Colors --- // --- The Accent Colors ---
readonly property string base08: "#fb4934" // Red (Variables, errors) readonly property string base08: "#cc6666" // Red (Variables, errors)
readonly property string base09: "#fe8019" // Orange (Integers, booleans, constants) readonly property string base09: "#de935f" // Orange (Integers, booleans, constants)
readonly property string base0A: "#fabd2f" // Yellow (Classes, search text bg, warnings) readonly property string base0A: "#f0c674" // Yellow (Classes, search text bg, warnings)
readonly property string base0B: "#b8bb26" // Green (Strings, success states) readonly property string base0B: "#b5bd68" // Green (Strings, success states)
readonly property string base0C: "#8ec07c" // Cyan (Support, regex, escape chars) readonly property string base0C: "#8abeb7" // Cyan (Support, regex, escape chars)
readonly property string base0D: "#83a598" // Blue (Functions, methods, headings) readonly property string base0D: "#81a2be" // Blue (Functions, methods, headings)
readonly property string base0E: "#d3869b" // Purple/Mauve (Keywords, storage, selectors) readonly property string base0E: "#b294bb" // Purple/Mauve (Keywords, storage, selectors)
readonly property string base0F: "#d65d0e" // Brown/Flamingo (Deprecated, embedded tags) readonly property string base0F: "#a3685a" // Brown/Flamingo (Deprecated, embedded tags)
} }

View File

@ -12,7 +12,7 @@ WrapperRectangle {
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base01
radius: 4 radius: 4
verticalOffset: 2 verticalOffset: 2
horizontalOffset: 2 horizontalOffset: 2

View File

@ -15,7 +15,7 @@ WrapperRectangle {
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base01
radius: 4 radius: 4
verticalOffset: 2 verticalOffset: 2
horizontalOffset: 2 horizontalOffset: 2

View File

@ -14,7 +14,7 @@ WrapperRectangle {
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base01
radius: 4 radius: 4
verticalOffset: 2 verticalOffset: 2
horizontalOffset: 2 horizontalOffset: 2

View File

@ -14,7 +14,7 @@ WrapperRectangle {
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base01
radius: 4 radius: 4
verticalOffset: 2 verticalOffset: 2
horizontalOffset: 2 horizontalOffset: 2

View File

@ -12,7 +12,7 @@ WrapperRectangle {
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base01
radius: 4 radius: 4
verticalOffset: 2 verticalOffset: 2
horizontalOffset: 2 horizontalOffset: 2

View File

@ -31,10 +31,10 @@ WrapperRectangle {
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base01
radius: 0 radius: 8
verticalOffset: 2 verticalOffset: 1
horizontalOffset: 2 horizontalOffset: 1
samples: 16 samples: 16
} }
} }

View File

@ -2,28 +2,26 @@ import Quickshell
import Quickshell.Widgets import Quickshell.Widgets
import QtQuick import QtQuick
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import Quickshell.Io
import qs import qs
import qs.settings import qs.settings
import qs.widgets import qs.widgets
Item { Item {
id: root id: root
property int gaps: 30 implicitWidth: wrapper.width
implicitWidth: wrapper.width + gaps implicitHeight: wrapper.height
implicitHeight: wrapper.height + gaps
ClippingWrapperRectangle { ClippingWrapperRectangle {
id: wrapper
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base00
horizontalOffset: 8 horizontalOffset: 2
verticalOffset: 8 verticalOffset: 2
radius: 8 radius: 8
samples: 16 samples: 16
} }
} }
id: wrapper
SystemClock { SystemClock {
id: clock id: clock
precision: SystemClock.Minutes precision: SystemClock.Minutes
@ -32,7 +30,6 @@ Item {
radius: Settings.config.rounding radius: Settings.config.rounding
anchors.centerIn: parent anchors.centerIn: parent
margin: 10 margin: 10
rightMargin: 15
child: Column { child: Column {
id: dataLayout id: dataLayout
spacing: 0 spacing: 0

View File

@ -11,17 +11,17 @@ import qs.widgets
Rectangle { Rectangle {
id: root id: root
color: Colors.base00 color: Colors.base01
radius: Settings.config.rounding * 1.5 radius: Settings.config.rounding
implicitWidth: 600 implicitWidth: 600
implicitHeight: 200 implicitHeight: 200
visible: getSpotify() != null visible: getSpotify() != null
layer { layer {
enabled: true enabled: true
effect: DropShadow { effect: DropShadow {
color: "#111111" color: Colors.base00
horizontalOffset: 8 horizontalOffset: 2
verticalOffset: 8 verticalOffset: 2
radius: 8 radius: 8
samples: 16 samples: 16
} }
@ -53,33 +53,25 @@ Rectangle {
anchors.margins: 10 anchors.margins: 10
margin: 0 margin: 0
anchors.fill: parent anchors.fill: parent
color: Colors.base00 color: "transparent"
RowLayout { RowLayout {
id: songLayout id: songLayout
spacing: 10 spacing: 0
ClippingWrapperRectangle { ClippingWrapperRectangle {
id: coverRounder id: coverRounder
Layout.fillWidth: true Layout.leftMargin: 10
Layout.fillHeight: true radius: 16
Layout.maximumWidth: songCover.sourceSize.width
radius: Settings.config.rounding
Image { Image {
id: songCover id: songCover
source: root.art source: root.art
sourceSize { sourceSize {
width: 180 width: 160
height: 180 height: 160
} }
} }
} }
WrapperRectangle { ColumnLayout {
color: Colors.base01
Layout.fillWidth: true
Layout.fillHeight: true
radius: Settings.config.rounding
margin: 20
child: ColumnLayout {
id: songInfo id: songInfo
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true Layout.fillWidth: true
@ -143,7 +135,7 @@ Rectangle {
implicitWidth: 200 implicitWidth: 200
implicitHeight: 6 implicitHeight: 6
color: Colors.base02 color: Colors.base02
radius: Settings.config.rounding radius: 32
} }
contentItem: Item { contentItem: Item {
implicitWidth: 200 implicitWidth: 200
@ -153,7 +145,7 @@ Rectangle {
Rectangle { Rectangle {
width: songProgress.visualPosition * parent.width width: songProgress.visualPosition * parent.width
height: parent.height height: parent.height
radius: Settings.config.rounding radius: 32
color: Colors.base07 color: Colors.base07
visible: !songProgress.indeterminate visible: !songProgress.indeterminate
} }
@ -212,4 +204,3 @@ Rectangle {
} }
} }
} }
}

View File

@ -2,9 +2,9 @@
"barHeight": 32, "barHeight": 32,
"barSpacing": 10, "barSpacing": 10,
"barmargins": 6, "barmargins": 6,
"currentWall": "/home/lucy/.walls/lance_of_longinus.png", "currentWall": "/home/lucy/.walls/frierensuff.png",
"floating": true, "floating": true,
"font": "Maple Mono", "font": "Lora",
"fontSize": 14, "fontSize": 14,
"margins": 10, "margins": 10,
"rounding": 26, "rounding": 26,