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