diff --git a/quickshell/ui/Clock.qml b/quickshell/ui/Clock.qml index 5cbc42e..f046b1f 100644 --- a/quickshell/ui/Clock.qml +++ b/quickshell/ui/Clock.qml @@ -5,7 +5,7 @@ import "../constants" Text { id: clock - color: Constants.colBlue + color: Colors.md3.on_primary_fixed font { family: Constants.fontFamily @@ -14,7 +14,7 @@ Text { } function updateTime() { - text = Qt.formatDateTime(new Date(), "ddd, MMM dd - HH:mm"); + text = Qt.formatDateTime(new Date(), "[dd-MM-yy] - [HH:mm]"); } Component.onCompleted: updateTime() diff --git a/quickshell/ui/LineSeparator.qml b/quickshell/ui/LineSeparator.qml new file mode 100644 index 0000000..20a20a2 --- /dev/null +++ b/quickshell/ui/LineSeparator.qml @@ -0,0 +1,9 @@ +import QtQuick +import "../constants" + +// vertical line separator for top bar +Rectangle { + width: 1 + height: 16 + color: Colors.md3.on_background +} diff --git a/quickshell/ui/TopBar.qml b/quickshell/ui/TopBar.qml index b3d0c10..f1c5ca5 100644 --- a/quickshell/ui/TopBar.qml +++ b/quickshell/ui/TopBar.qml @@ -72,33 +72,29 @@ Item { RowLayout { spacing: 10 + LineSeparator {} + BarText { prefix: "C" value: cpuUsage } - Rectangle { - width: 1 - height: 16 - color: Colors.md3.on_background - } + LineSeparator {} BarText { prefix: "M" value: memUsage } - Rectangle { - width: 1 - height: 16 - color: Colors.md3.on_background - } + LineSeparator {} BarText { prefix: "G" value: gpuUsage } + LineSeparator {} + Clock {} } }