diff --git a/modules/Flyout.qml b/modules/Flyout.qml index 770205b..f312878 100644 --- a/modules/Flyout.qml +++ b/modules/Flyout.qml @@ -44,6 +44,7 @@ PanelWindow { id: label anchors.centerIn: parent text: M.FlyoutState.text + textFormat: Text.RichText color: M.Theme.base05 font.pixelSize: M.Theme.fontSize font.family: M.Theme.fontFamily diff --git a/modules/Mpris.qml b/modules/Mpris.qml index 060d06a..ddfa187 100644 --- a/modules/Mpris.qml +++ b/modules/Mpris.qml @@ -28,7 +28,7 @@ M.BarSection { anchors.verticalCenter: parent.verticalCenter } M.BarLabel { - label: root.player?.identity ?? "" + label: root.player?.trackTitle || root.player?.identity || "" anchors.verticalCenter: parent.verticalCenter } diff --git a/modules/ThemedIcon.qml b/modules/ThemedIcon.qml new file mode 100644 index 0000000..066cae2 --- /dev/null +++ b/modules/ThemedIcon.qml @@ -0,0 +1,16 @@ +import QtQuick +import QtQuick.Effects + +Image { + id: root + + required property color tint + + fillMode: Image.PreserveAspectFit + + layer.enabled: true + layer.effect: MultiEffect { + colorization: 1.0 + colorizationColor: root.tint + } +} diff --git a/modules/Tray.qml b/modules/Tray.qml index 544fb15..9b9de01 100644 --- a/modules/Tray.qml +++ b/modules/Tray.qml @@ -20,10 +20,10 @@ RowLayout { implicitWidth: 18 implicitHeight: 18 - Image { + M.ThemedIcon { anchors.fill: parent source: iconItem.modelData.icon - fillMode: Image.PreserveAspectFit + tint: M.Theme.base05 } HoverHandler { diff --git a/modules/TrayMenu.qml b/modules/TrayMenu.qml index e45a920..7782dd2 100644 --- a/modules/TrayMenu.qml +++ b/modules/TrayMenu.qml @@ -23,8 +23,7 @@ PanelWindow { color: "transparent" WlrLayershell.layer: WlrLayer.Overlay - // -1 = ignore exclusive zones so this covers the full screen including the bar - WlrLayershell.exclusiveZone: -1 + WlrLayershell.exclusiveZone: 0 WlrLayershell.namespace: "nova-traymenu" anchors.top: true @@ -46,7 +45,7 @@ PanelWindow { Math.round(menuWindow.anchorX - menuStack.width / 2), menuWindow.width - menuStack.width )) - y: M.Theme.barHeight + y: 0 width: menuStack.width height: menuStack.height @@ -59,7 +58,7 @@ PanelWindow { Rectangle { anchors.fill: parent color: M.Theme.base01 - opacity: M.Theme.barOpacity + opacity: Math.max(M.Theme.barOpacity, 0.85) topLeftRadius: 0 topRightRadius: 0 bottomLeftRadius: M.Theme.radius diff --git a/modules/qmldir b/modules/qmldir index 8c084a6..3fbd13d 100644 --- a/modules/qmldir +++ b/modules/qmldir @@ -11,6 +11,7 @@ Clock 1.0 Clock.qml Volume 1.0 Volume.qml Tray 1.0 Tray.qml TrayMenu 1.0 TrayMenu.qml +ThemedIcon 1.0 ThemedIcon.qml Battery 1.0 Battery.qml Mpris 1.0 Mpris.qml Network 1.0 Network.qml