lucy/quickshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some stuff and simplify shit

Browse Source
This commit is contained in:
lucy 2026-01-16 21:35:03 +01:00
parent 216bfbaa9f
commit 5507646719
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Colors.qml
View File

@ -5,25 +5,25 @@ import Quickshell
Singleton { Singleton {
id: customColors id: customColors
// Core Backgrounds // Core Backgrounds
readonly property color background: "#141B1E" readonly property color background: "#161616"
readonly property color foreground: "#DADADA" readonly property color foreground: "#FFFFFF"
readonly property color cursor: "#DADADA" readonly property color cursor: "#6F6F6F"
// The 16 Colors of the Apocalypse // The 16 Colors of the Apocalypse
readonly property color color0: "#232A2D" readonly property color color0: "#262626"
readonly property color color1: "#E57474" readonly property color color1: "#EE5396"
readonly property color color2: "#8CCF7E" readonly property color color2: "#42BE65"
readonly property color color3: "#E5C76B" readonly property color color3: "#FFE97B"
readonly property color color4: "#67B0E8" readonly property color color4: "#33B1FF"
readonly property color color5: "#C47FD5" readonly property color color5: "#FF7EB6"
readonly property color color6: "#6CBFBF" readonly property color color6: "#3DDBD9"
readonly property color color7: "#B3B9B8" readonly property color color7: "#DDE1E6"
readonly property color color8: "#2D3437" readonly property color color8: "#393939"
readonly property color color9: "#EF7E7E" readonly property color color9: "#EE5396"
readonly property color color10: "#96D988" readonly property color color10: "#42BE65"
readonly property color color11: "#F4D67A" readonly property color color11: "#FFE97B"
readonly property color color12: "#71BAF2" readonly property color color12: "#33B1FF"
readonly property color color13: "#CE89DF" readonly property color color13: "#FF7EB6"
readonly property color color14: "#67CBE7" readonly property color color14: "#3DDBD9"
readonly property color color15: "#BDC3C2" readonly property color color15: "#FFFFFF"
} }

11
modules/Bar/Bar.qml
View File

@ -18,15 +18,18 @@ Variants {
left: true left: true
right: true right: true
} }
margins {
left: 10
right: 10
}
implicitHeight: Settings.config.barHeight implicitHeight: Settings.config.barHeight
RowLayout { RowLayout {
id: leftStuff id: leftStuff
spacing: 10 spacing: 20
anchors.left: parent.left anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Workspaces { Workspaces {
property var screen: root.modelData property var screen: root.modelData
Layout.leftMargin: 10
} }
Title {} Title {}
} }
@ -44,9 +47,7 @@ Variants {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Volume {} Volume {}
Battery {} Battery {}
SystemTray { SystemTray {}
Layout.rightMargin: 10
}
} }
} }
} }

2
modules/Bar/Battery.qml
View File

@ -44,7 +44,7 @@ Loader {
} }
} }
implicitWidth: batRow.implicitWidth implicitWidth: batRow.width
implicitHeight: Settings.config.barHeight implicitHeight: Settings.config.barHeight
Row { Row {

1
modules/Bar/SystemTray.qml
View File

@ -7,6 +7,7 @@ Item {
id: root id: root
implicitWidth: trayRow.implicitWidth implicitWidth: trayRow.implicitWidth
implicitHeight: Settings.config.barHeight implicitHeight: Settings.config.barHeight
visible: trayRepeater.count > 0
Row { Row {
id: trayRow id: trayRow

4
modules/Bar/Title.qml
View File

@ -1,8 +1,6 @@
import Quickshell
import QtQuick import QtQuick
import "../../reusables/" import "../../reusables/"
import "../../settings/" import "../../settings/"
import "../../"
import Quickshell.Hyprland import Quickshell.Hyprland
Item { Item {
@ -14,6 +12,6 @@ Item {
id: text id: text
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: root.activeWindow?.activated ? Hyprland.activeToplevel.title : "Desktop" text: root.activeWindow ? Hyprland.activeToplevel.title : "Desktop"
} }
} }

12
modules/Bar/Volume.qml
View File

@ -7,6 +7,8 @@ import "../../"
Item { Item {
id: root id: root
implicitWidth: textRow.width
implicitHeight: Settings.config.barHeight
property var sink: Pipewire.defaultAudioSink property var sink: Pipewire.defaultAudioSink
function getVolumeIcon() { function getVolumeIcon() {
// Safety check: if Pipewire is dead or sink is missing // Safety check: if Pipewire is dead or sink is missing
@ -30,11 +32,9 @@ Item {
// If it's loud, prepare the ears! // If it's loud, prepare the ears!
return "volume_up"; return "volume_up";
} }
implicitWidth: textRow.implicitWidth + 10
implicitHeight: Settings.config.barHeight
Row { Row {
id: textRow id: textRow
anchors.centerIn: parent anchors.verticalCenter: parent.verticalCenter
spacing: 5 spacing: 5
CustomText { CustomText {
id: volumeText id: volumeText
@ -42,12 +42,12 @@ Item {
objects: Pipewire.ready ? Pipewire.defaultAudioSink : [] objects: Pipewire.ready ? Pipewire.defaultAudioSink : []
} }
text: Pipewire.ready ? Math.round(root.sink.audio.volume * 100) + "%" : "failure" text: Pipewire.ready ? Math.round(root.sink.audio.volume * 100) + "%" : "failure"
opacity: root.sink.audio.muted ? 0.5 : 1 opacity: Pipewire.ready ? root.sink.audio.muted ? 0.5 : 1 : 0
} }
CustomIcon { CustomIcon {
id: volumeIcon id: volumeIcon
opacity: root.sink.audio.muted ? 0.5 : 1 opacity: Pipewire.ready ? root.sink.audio.muted ? 0.5 : 1 : 0
text: root.getVolumeIcon() text: Pipewire.ready ? root.getVolumeIcon() : null
} }
} }
} }