diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 00e7990..63d931c 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -1,6 +1,7 @@ pragma ComponentBehavior: Bound import Quickshell import QtQuick +import QtQuick.Layouts import qs import qs.settings @@ -32,9 +33,9 @@ Variants { color: Qt.rgba(Colors.surface.r, Colors.surface.g, Colors.surface.b, Settings.config.translucency) radius: Settings.config.floating ? Settings.config.barHeight / 2 : 0 - Row { + RowLayout { id: leftStuff - leftPadding: Settings.config.barHeight / 4 + anchors.margins: Settings.config.barHeight / 4 spacing: 10 anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter @@ -51,9 +52,9 @@ Variants { Clock {} } - Row { + RowLayout { id: rightStuff - rightPadding: Settings.config.barHeight / 4 + anchors.margins: Settings.config.barHeight / 4 spacing: 10 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index bbd774c..05adbf4 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -11,7 +11,6 @@ import qs.settings Loader { id: batLoader active: UPower.displayDevice.isLaptopBattery - anchors.verticalCenter: parent.verticalCenter sourceComponent: Rectangle { id: container diff --git a/modules/bar/Network.qml b/modules/bar/Network.qml index 34862d2..6670d4d 100644 --- a/modules/bar/Network.qml +++ b/modules/bar/Network.qml @@ -13,7 +13,6 @@ Rectangle { color: "transparent" implicitHeight: Settings.config.barHeight - 10 implicitWidth: mainLayout.implicitWidth - anchors.verticalCenter: parent.verticalCenter // --- Logic Functions --- function getIcon(device) { diff --git a/modules/bar/SettingsIcon.qml b/modules/bar/SettingsIcon.qml index 1ff2e06..37fa85d 100644 --- a/modules/bar/SettingsIcon.qml +++ b/modules/bar/SettingsIcon.qml @@ -8,7 +8,6 @@ Rectangle { id: root radius: implicitHeight / 2 color: pavuArea.containsMouse ? Colors.primaryContainer : Colors.surfaceContainer - anchors.verticalCenter: parent.verticalCenter implicitWidth: volumeIcon.implicitWidth + 10 implicitHeight: Settings.config.barHeight - 10 CustomIcon { diff --git a/modules/bar/Title.qml b/modules/bar/Title.qml index 85df49e..2b5cf62 100644 --- a/modules/bar/Title.qml +++ b/modules/bar/Title.qml @@ -8,7 +8,6 @@ Rectangle { id: container radius: implicitHeight / 2 color: Colors.surfaceContainer - anchors.verticalCenter: parent.verticalCenter implicitWidth: root.implicitWidth implicitHeight: Settings.config.barHeight - 10 Item { diff --git a/modules/bar/Volume.qml b/modules/bar/Volume.qml index 3a8b308..183e171 100644 --- a/modules/bar/Volume.qml +++ b/modules/bar/Volume.qml @@ -10,7 +10,6 @@ Rectangle { id: root radius: implicitHeight / 2 color: pavuArea.containsMouse ? Colors.primaryContainer : Colors.surfaceContainer - anchors.verticalCenter: parent.verticalCenter implicitWidth: textRow.implicitWidth + 20 implicitHeight: Settings.config.barHeight - 8 property var sink: Pipewire.defaultAudioSink diff --git a/modules/bar/Workspaces.qml b/modules/bar/Workspaces.qml index 040445b..c12163f 100644 --- a/modules/bar/Workspaces.qml +++ b/modules/bar/Workspaces.qml @@ -10,9 +10,8 @@ Rectangle { color: Colors.surfaceContainer implicitWidth: workspaceRow.implicitWidth + 10 - implicitHeight: Settings.config.barHeight - 10 + implicitHeight: Settings.config.barHeight - 10 radius: Settings.config.barHeight / 2 - anchors.verticalCenter: parent.verticalCenter property var screen: screen Row { id: workspaceRow