diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bar/Pills.qml | 31 | ||||
| -rw-r--r-- | modules/bar/components/Tray.qml | 3 |
2 files changed, 20 insertions, 14 deletions
diff --git a/modules/bar/Pills.qml b/modules/bar/Pills.qml index 503de02..8a329b9 100644 --- a/modules/bar/Pills.qml +++ b/modules/bar/Pills.qml @@ -57,35 +57,40 @@ Item { } Pill { - anchors.right: parent.right - - Clock { - id: clock + anchors.right: rightPill.left + anchors.rightMargin: Appearance.padding.normal + Tray { vertical: BarConfig.vertical + anchors.left: root.get(clock.right, undefined) + anchors.leftMargin: root.get(Appearance.padding.large, 0) + anchors.top: root.get(undefined, clock.bottom) + anchors.topMargin: root.get(0, Appearance.padding.large) + anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter) anchors.verticalCenter: root.get(parent.verticalCenter, undefined) } + } - Tray { - id: tray + Pill { + id: rightPill - vertical: BarConfig.vertical + anchors.right: parent.right - anchors.left: root.get(clock.right, undefined) - anchors.leftMargin: root.get(Appearance.padding.large, 0) - anchors.top: root.get(undefined, clock.bottom) - anchors.topMargin: root.get(0, Appearance.padding.large) + Clock { + id: clock + + vertical: BarConfig.vertical anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter) anchors.verticalCenter: root.get(parent.verticalCenter, undefined) } StatusIcons { - anchors.left: root.get(tray.right, undefined) + anchors.left: root.get(clock.right, undefined) anchors.leftMargin: root.get(Appearance.padding.large, 0) - anchors.top: root.get(undefined, tray.bottom) + anchors.top: root.get(undefined, clock.bottom) anchors.topMargin: root.get(0, Appearance.padding.large) anchors.horizontalCenter: root.get(undefined, parent.horizontalCenter) diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml index 37de73b..8aaa533 100644 --- a/modules/bar/components/Tray.qml +++ b/modules/bar/components/Tray.qml @@ -43,12 +43,13 @@ StyledRect { IconImage { id: icon - visible: false + visible: !BarConfig.tray.recolourIcons source: item.modelData.icon anchors.fill: parent } ColorOverlay { + visible: BarConfig.tray.recolourIcons anchors.fill: icon source: icon color: Appearance.colours.lavender |