diff --git a/config/Dimensions.qml b/config/Dimensions.qml index df27c14..81f0a7e 100644 --- a/config/Dimensions.qml +++ b/config/Dimensions.qml @@ -11,7 +11,6 @@ Singleton { property Bar bar: Bar {} property Mpris mpris: Mpris {} property Clock clock: Clock {} - property Pipewire pipewire: Pipewire {} property Caffeine caffeine: Caffeine {} property Workspace workspace: Workspace {} property Tray tray: Tray {} @@ -47,19 +46,10 @@ Singleton { property int verticalPadding: 6 } - component Pipewire: QtObject { - id: clock - - property int fontSize: 14 - property int height: 30 - property int horizontalPadding: 8 - property int verticalPadding: 6 - } - component Caffeine: QtObject { id: clock - property int fontSize: 16 + property int iconSize: 14 property int height: 30 property int horizontalPadding: 8 property int verticalPadding: 6 diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 927d7f2..c4b766a 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -92,10 +92,6 @@ Scope { spacing: Dimensions.bar.spacing - Pipewire { - anchors.verticalCenter: parent.verticalCenter - } - Caffeine { anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/bar/components/Caffeine.qml b/modules/bar/components/Caffeine.qml index 18c15a2..4e5f1cf 100644 --- a/modules/bar/components/Caffeine.qml +++ b/modules/bar/components/Caffeine.qml @@ -26,17 +26,17 @@ Clickable { id: text font.family: Theme.lucide.font.family - font.pixelSize: Dimensions.caffeine.fontSize + font.pixelSize: Dimensions.workspace.iconSize font.bold: true text: Icons.coffee color: clickable.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent anchors.verticalCenter: parent.verticalCenter - topPadding: Dimensions.caffeine.verticalPadding - bottomPadding: Dimensions.caffeine.verticalPadding - leftPadding: Dimensions.caffeine.horizontalPadding - rightPadding: Dimensions.caffeine.horizontalPadding + topPadding: Dimensions.mpris.verticalPadding + bottomPadding: Dimensions.mpris.verticalPadding + leftPadding: Dimensions.mpris.horizontalPadding + rightPadding: Dimensions.mpris.horizontalPadding } Process { diff --git a/modules/bar/components/Pipewire.qml b/modules/bar/components/Pipewire.qml deleted file mode 100644 index 0a864ed..0000000 --- a/modules/bar/components/Pipewire.qml +++ /dev/null @@ -1,72 +0,0 @@ -import QtQuick -import Quickshell.Services.Pipewire -import "../../../config/" -import "../../../styled/" - -Clickable { - id: clickable - - property var sink: Pipewire.defaultAudioSink - - implicitWidth: text.width - implicitHeight: Dimensions.pipewire.height - - PwObjectTracker { - id: bound - objects: [clickable.sink] - } - - onClicked: mouse => { - if (mouse.button == Qt.LeftButton) { - sink.audio.muted = !sink.audio.muted; - } else if (mouse.button == Qt.RightButton) { - // show menu - } - } - - onWheel: event => { - if (event.angleDelta.y > 0) { - sink.audio.volume = Math.min(sink.audio.volume + 0.02, 1.0); - } else if (event.angleDelta.y < 0) { - sink.audio.volume -= 0.02; - } - } - - states: [ - State { - name: "muted" - when: clickable.sink.audio.muted - PropertyChanges { - text { - icon: " " - } - } - }, - State { - name: "off" - when: clickable.sink.audio.volume <= 0 - PropertyChanges { - text { - icon: " " - } - } - } - ] - - StyledText { - id: text - - property string icon: " " - - text: `${icon} ${(Pipewire.defaultAudioSink.audio.volume * 100).toFixed()}%` - font.pixelSize: Dimensions.pipewire.fontSize - - color: clickable.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent - - anchors.verticalCenter: parent.verticalCenter - topPadding: Dimensions.pipewire.verticalPadding - bottomPadding: Dimensions.pipewire.verticalPadding - leftPadding: Dimensions.pipewire.horizontalPadding - rightPadding: Dimensions.pipewire.horizontalPadding - } -}