diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 7711ece..6358be3 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -23,11 +23,13 @@ Variants { margins.left: Config.cfg.bar.floating ? 10 : 0 margins.right: Config.cfg.bar.floating ? 10 : 0 Rectangle { - anchors.fill: parent color: Colors.barBg - radius: Config.cfg.bar.floating ?? Config.cfg.appearance.rounding + radius: Config.cfg.bar.floating ? Config.cfg.appearance.rounding : 0 + anchors.fill: parent + implicitHeight: parent.height + anchors.centerIn: parent RowLayout { - anchors.leftMargin: 4 + anchors.leftMargin: 10 anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter Ws { @@ -42,7 +44,7 @@ Variants { Date {} } RowLayout { - anchors.rightMargin: 4 + anchors.rightMargin: 10 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter Mpris { diff --git a/modules/bar/Netstatus.qml b/modules/bar/Netstatus.qml index 79331e3..a7af773 100644 --- a/modules/bar/Netstatus.qml +++ b/modules/bar/Netstatus.qml @@ -5,11 +5,12 @@ import QtQuick.Layouts BarComponent { id: root - implicitWidth: networkLayout.implicitWidth + 24 + implicitWidth: networkLayout.implicitWidth RowLayout { id: networkLayout anchors.centerIn: root - spacing: 10 + anchors.fill: root + spacing: 5 StyledIcon { iconName: Network.getWifiIcon() } diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml index 9e18da8..6db649c 100644 --- a/modules/bar/Ws.qml +++ b/modules/bar/Ws.qml @@ -9,7 +9,7 @@ import qs.settings BarComponent { id: root required property ShellScreen barScreen - implicitWidth: wsLayout.implicitWidth + implicitWidth: wsLayout.implicitWidth RowLayout { id: wsLayout anchors.centerIn: parent @@ -19,7 +19,7 @@ BarComponent { delegate: BarComponent { id: wsContainer required property var modelData - implicitWidth: root.implicitHeight / 1.5 + implicitWidth: 16 implicitHeight: implicitWidth color: modelData.active ? Colors.accent : 'transparent' MouseArea { diff --git a/settings/settings.json b/settings/settings.json index 0ddc85a..ecb7f03 100644 --- a/settings/settings.json +++ b/settings/settings.json @@ -6,7 +6,7 @@ "rounding": 16 }, "bar": { - "floating": false, + "floating": true, "height": 34, "opacity": 1 }, diff --git a/widgets/BarComponent.qml b/widgets/BarComponent.qml index cb1c61c..249119f 100644 --- a/widgets/BarComponent.qml +++ b/widgets/BarComponent.qml @@ -6,7 +6,6 @@ import qs.settings Rectangle { property bool active: false color: active ? Colors.activeModuleBg : Colors.barBg - implicitHeight: Config.cfg.bar.height - 8 radius: Config.cfg.appearance.rounding }