diff --git a/bar/Bar.qml b/bar/Bar.qml index 207a85d..72ae17d 100644 --- a/bar/Bar.qml +++ b/bar/Bar.qml @@ -65,10 +65,24 @@ Scope { Layout.fillWidth: false Layout.fillHeight: true } + StyledText { + Layout.alignment: Qt.AlignVCenter + font.pixelSize: Appearance.font.pixelSize.larger + color: Appearance.colors.colSubtext + text: "•" + visible: true + } NotificationIcon { Layout.fillWidth: false Layout.fillHeight: true } + StyledText { + Layout.alignment: Qt.AlignVCenter + font.pixelSize: Appearance.font.pixelSize.larger + color: Appearance.colors.colSubtext + text: "•" + visible: true + } ClockWidget { id: clock Layout.fillHeight: true diff --git a/bar/NotificationIcon.qml b/bar/NotificationIcon.qml index e4544a0..86bfba3 100644 --- a/bar/NotificationIcon.qml +++ b/bar/NotificationIcon.qml @@ -8,38 +8,30 @@ Item { height: parent.height implicitWidth: rowLayout.implicitWidth - Layout.leftMargin: Appearance.rounding.screenRounding RowLayout { id: rowLayout anchors.fill: parent - spacing: 15 + //spacing: 15 StyledText { Layout.alignment: Qt.AlignVCenter font.pixelSize: Appearance.font.pixelSize.larger color: Appearance.m3colors.m3error - text: NotificationServer.amountNotifications + text: "" + NotificationServer.amountNotifications visible: { NotificationServer.amountNotifications > 0 } } MaterialSymbol { + Layout.alignment: Qt.AlignVCenter visible: true - anchors.centerIn: parent + fill: 1 text: NotificationServer.amountNotifications > 0 ? "notifications_unread" : "notifications" iconSize: Appearance.font.pixelSize.larger color: NotificationServer.amountNotifications > 0 ? Appearance.m3colors.m3error : Appearance.m3colors.m3onSecondaryContainer } - - StyledText { - Layout.alignment: Qt.AlignVCenter - font.pixelSize: Appearance.font.pixelSize.larger - color: Appearance.colors.colSubtext - text: "•" - visible: true - } } } \ No newline at end of file diff --git a/bar/SysTray.qml b/bar/SysTray.qml index ff63ab3..c42ad79 100644 --- a/bar/SysTray.qml +++ b/bar/SysTray.qml @@ -9,7 +9,6 @@ Item { height: parent.height implicitWidth: rowLayout.implicitWidth - Layout.leftMargin: Appearance.rounding.screenRounding RowLayout { id: rowLayout @@ -25,15 +24,5 @@ Item { item: modelData } } - - StyledText { - Layout.alignment: Qt.AlignVCenter - font.pixelSize: Appearance.font.pixelSize.larger - color: Appearance.colors.colSubtext - text: "•" - visible: { - SystemTray.items.values.length > 0 - } - } } } \ No newline at end of file