vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osd attached to triggering module position, per-screen filtering

Browse source
This commit is contained in:
Damocles 2026-04-12 17:57:12 +02:00
parent 85a1260a35
commit 66dc628752
4 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/Backlight.qml
View file

@ -1,4 +1,5 @@
import QtQuick import QtQuick
import Quickshell
import Quickshell.Io import Quickshell.Io
import "." as M import "." as M
@ -11,7 +12,7 @@ M.BarSection {
property int percent: 0 property int percent: 0
onPercentChanged: if (percent > 0) onPercentChanged: if (percent > 0)
M.OsdState.show(percent / 100, "\uF185") M.OsdState.show(percent / 100, "\uF185", root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0), QsWindow.window?.screen ?? null)
Process { Process {
id: adjProc id: adjProc

7
modules/Osd.qml
View file

@ -13,7 +13,7 @@ PanelWindow {
color: "transparent" color: "transparent"
property bool _winVisible: false property bool _winVisible: false
property bool _shown: M.OsdState.visible property bool _shown: M.OsdState.visible && M.OsdState.screen === root.screen
on_ShownChanged: { on_ShownChanged: {
if (_shown) { if (_shown) {
@ -35,7 +35,10 @@ PanelWindow {
anchors.left: true anchors.left: true
margins.top: 0 margins.top: 0
margins.left: Math.round((screen.width - implicitWidth) / 2) margins.left: Math.max(0, Math.min(
Math.round(M.OsdState.itemX - implicitWidth / 2),
screen.width - implicitWidth
))
implicitWidth: 200 implicitWidth: 200
implicitHeight: 48 implicitHeight: 48

6
modules/OsdState.qml
View file

@ -5,15 +5,19 @@ QtObject {
property bool visible: false property bool visible: false
property real value: 0 // 0.0–1.0 property real value: 0 // 0.0–1.0
property string icon: "" property string icon: ""
property real itemX: 0
property var screen: null
property Timer _timer: Timer { property Timer _timer: Timer {
interval: 1500 interval: 1500
onTriggered: visible = false onTriggered: visible = false
} }
function show(val, ico) { function show(val, ico, x, scr) {
value = val; value = val;
icon = ico; icon = ico;
itemX = x;
screen = scr;
visible = true; visible = true;
_timer.restart(); _timer.restart();
} }

9
modules/Volume.qml
View file

@ -1,4 +1,5 @@
import QtQuick import QtQuick
import Quickshell
import Quickshell.Services.Pipewire import Quickshell.Services.Pipewire
import "." as M import "." as M
@ -15,8 +16,12 @@ M.BarSection {
readonly property real volume: sink?.audio?.volume ?? 0 readonly property real volume: sink?.audio?.volume ?? 0
readonly property bool muted: sink?.audio?.muted ?? false readonly property bool muted: sink?.audio?.muted ?? false
onVolumeChanged: M.OsdState.show(volume, root.muted ? "\uF026" : (volume > 0.5 ? "\uF028" : "\uF027")) function _showOsd() {
onMutedChanged: M.OsdState.show(volume, root.muted ? "\uF026" : (volume > 0.5 ? "\uF028" : "\uF027")) const ico = root.muted ? "\uF026" : (volume > 0.5 ? "\uF028" : "\uF027");
M.OsdState.show(volume, ico, root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0), QsWindow.window?.screen ?? null);
}
onVolumeChanged: _showOsd()
onMutedChanged: _showOsd()
M.BarIcon { M.BarIcon {
icon: root.muted ? "\uF026" : (root.volume > 0.5 ? "\uF028" : (root.volume > 0 ? "\uF027" : "\uF026")) icon: root.muted ? "\uF026" : (root.volume > 0.5 ? "\uF028" : (root.volume > 0 ? "\uF027" : "\uF026"))