Merge branch 'main' into system_monitor_high_pressure_highlight

Modules/Bar/Widgets/Microphone.qml

@@ -50,6 +50,9 @@ Item {
         // Ignore the first volume change
         firstInputVolumeReceived = true
       } else {
+        // If a tooltip is visible while we show the pill
+        // hide it so it doesn't overlap the volume slider.
+        TooltipService.hide()
         pill.show()
         externalHideTimer.restart()
       }
@@ -65,6 +68,7 @@ Item {
         // Ignore the first mute change
         firstInputVolumeReceived = true
       } else {
+        TooltipService.hide()
         pill.show()
         externalHideTimer.restart()
       }
@@ -96,6 +100,9 @@ Item {
                          })
 
     onWheel: function (delta) {
+      // As soon as we start scrolling to adjust volume, hide the tooltip
+      TooltipService.hide()
+
       wheelAccumulator += delta
       if (wheelAccumulator >= 120) {
         wheelAccumulator = 0

Modules/Bar/Widgets/Volume.qml

@@ -50,6 +50,8 @@ Item {
         // Ignore the first volume change
         firstVolumeReceived = true
       } else {
+        // Hide any tooltip while the pill is visible / being updated
+        TooltipService.hide()
         pill.show()
         externalHideTimer.restart()
       }
@@ -81,6 +83,9 @@ Item {
                          })
 
     onWheel: function (delta) {
+      // Hide tooltip as soon as the user starts scrolling to adjust volume
+      TooltipService.hide()
+
       wheelAccumulator += delta
       if (wheelAccumulator >= 120) {
         wheelAccumulator = 0