1 files changed, 50 insertions, 18 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml b/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml
index 3a78d91b..16fb5dea 100644
--- a/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml
+++ b/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml
@@ -7,23 +7,38 @@ import Quickshell.Widgets
 Scope {
   id: root
 
-  property bool show: false
+  property string show: ""
   property bool inhibited: true
 
   PwObjectTracker {
-    objects: [ Pipewire.defaultAudioSink ]
+    objects: [ Pipewire.defaultAudioSink, Pipewire.defaultAudioSource ]
   }
 
   Connections {
+    enabled: Pipewire.defaultAudioSink
     target: Pipewire.defaultAudioSink?.audio
 
     function onVolumeChanged() {
-      root.show = true;
-      hideTimer.reset();
+      root.show = "sink";
+      hideTimer.restart();
     }
     function onMutedChanged() {
-      root.show = true;
-      hideTimer.reset();
+      root.show = "sink";
+      hideTimer.restart();
+    }
+  }
+
+  Connections {
+    enabled: Pipewire.defaultAudioSource
+    target: Pipewire.defaultAudioSource?.audio
+
+    function onVolumeChanged() {
+      root.show = "source";
+      hideTimer.restart();
+    }
+    function onMutedChanged() {
+      root.show = "source";
+      hideTimer.restart();
     }
   }
 
@@ -34,15 +49,18 @@ Scope {
 
   Timer {
     id: hideTimer
-    interval: 2000
-    onTriggered: root.show = false
+    interval: 1000
+    onTriggered: root.show = ""
   }
 
   Timer {
     id: startInhibit
     interval: 100
     running: true
-    onTriggered: root.inhibited = false;
+    onTriggered: {
+      root.show = "";
+      root.inhibited = false;
+    }
   }
 
   LazyLoader {
@@ -62,8 +80,9 @@ Scope {
           screen: screenScope.modelData
 
           anchors.top: true
-          margins.top: (screen.height - window.height) / 2
+          margins.top: screen.height / 2 - 50 + 3.5
           exclusiveZone: 0
+          exclusionMode: ExclusionMode.Ignore
 
           implicitWidth: 400
           implicitHeight: 50
@@ -92,13 +111,20 @@ Scope {
               implicitHeight: parent.height
 
               icon: {
-                if (!Pipewire.defaultAudioSink || Pipewire.defaultAudioSink.audio.muted)
-                  return "volume-off";
-                if (Pipewire.defaultAudioSink.audio.volume <= 0.33)
-                  return "volume-low";
-                if (Pipewire.defaultAudioSink.audio.volume <= 0.67)
-                  return "volume-medium";
-                return "volume-high";
+                if (root.show == "sink") {
+                  if (!Pipewire.defaultAudioSink || Pipewire.defaultAudioSink.audio.muted)
+                    return "volume-off";
+                  if (Pipewire.defaultAudioSink.audio.volume <= 0.33)
+                    return "volume-low";
+                  if (Pipewire.defaultAudioSink.audio.volume <= 0.67)
+                    return "volume-medium";
+                  return "volume-high";
+                } else if (root.show == "source") {
+                  if (!Pipewire.defaultAudioSource || Pipewire.defaultAudioSource.audio.muted)
+                    return "microphone-off";
+                  return "microphone";
+                }
+              return "volume-high";
               }
             }
 
@@ -118,7 +144,13 @@ Scope {
 
                 color: Pipewire.defaultAudioSink?.audio.muted ? "#70ffffff" : "white"
 
-                implicitWidth: parent.width * (Pipewire.defaultAudioSink?.audio.volume ?? 0)
+                implicitWidth: {
+                  if (root.show == "sink")
+                    return parent.width * (Pipewire.defaultAudioSink?.audio.volume ?? 0);
+                  else if (root.show == "source")
+                    return parent.width * (Pipewire.defaultAudioSource?.audio.volume ?? 0);
+                  return 0;
+                }
               }
             }
           }