fix left/right spacing

This commit is contained in:
lucy 2026-09-09 00:09:33 +02:00
commit 9590f5dc63
5 changed files with 12 additions and 10 deletions

View file

@ -23,11 +23,13 @@ Variants {
margins.left: Config.cfg.bar.floating ? 10 : 0 margins.left: Config.cfg.bar.floating ? 10 : 0
margins.right: Config.cfg.bar.floating ? 10 : 0 margins.right: Config.cfg.bar.floating ? 10 : 0
Rectangle { Rectangle {
anchors.fill: parent
color: Colors.barBg 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 { RowLayout {
anchors.leftMargin: 4 anchors.leftMargin: 10
anchors.left: parent.left anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Ws { Ws {
@ -42,7 +44,7 @@ Variants {
Date {} Date {}
} }
RowLayout { RowLayout {
anchors.rightMargin: 4 anchors.rightMargin: 10
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Mpris { Mpris {

View file

@ -5,11 +5,12 @@ import QtQuick.Layouts
BarComponent { BarComponent {
id: root id: root
implicitWidth: networkLayout.implicitWidth + 24 implicitWidth: networkLayout.implicitWidth
RowLayout { RowLayout {
id: networkLayout id: networkLayout
anchors.centerIn: root anchors.centerIn: root
spacing: 10 anchors.fill: root
spacing: 5
StyledIcon { StyledIcon {
iconName: Network.getWifiIcon() iconName: Network.getWifiIcon()
} }

View file

@ -9,7 +9,7 @@ import qs.settings
BarComponent { BarComponent {
id: root id: root
required property ShellScreen barScreen required property ShellScreen barScreen
implicitWidth: wsLayout.implicitWidth implicitWidth: wsLayout.implicitWidth
RowLayout { RowLayout {
id: wsLayout id: wsLayout
anchors.centerIn: parent anchors.centerIn: parent
@ -19,7 +19,7 @@ BarComponent {
delegate: BarComponent { delegate: BarComponent {
id: wsContainer id: wsContainer
required property var modelData required property var modelData
implicitWidth: root.implicitHeight / 1.5 implicitWidth: 16
implicitHeight: implicitWidth implicitHeight: implicitWidth
color: modelData.active ? Colors.accent : 'transparent' color: modelData.active ? Colors.accent : 'transparent'
MouseArea { MouseArea {

View file

@ -6,7 +6,7 @@
"rounding": 16 "rounding": 16
}, },
"bar": { "bar": {
"floating": false, "floating": true,
"height": 34, "height": 34,
"opacity": 1 "opacity": 1
}, },

View file

@ -6,7 +6,6 @@ import qs.settings
Rectangle { Rectangle {
property bool active: false property bool active: false
color: active ? Colors.activeModuleBg : Colors.barBg color: active ? Colors.activeModuleBg : Colors.barBg
implicitHeight: Config.cfg.bar.height - 8 implicitHeight: Config.cfg.bar.height - 8
radius: Config.cfg.appearance.rounding radius: Config.cfg.appearance.rounding
} }