From 76b66260734d82011334d4b79fcbf5af7d3ea259 Mon Sep 17 00:00:00 2001
From: LemmyCook <studio@quadbyte.net>
Date: Sun, 14 Sep 2025 13:35:24 -0400
Subject: [PATCH] Trying to match all buttons left/right click.

- left click: mute/unmute, cycle between functionality
- right click: open settings
- middle click: open external settings
---
 Modules/Bar/Widgets/Brightness.qml | 4 ++--
 Modules/Bar/Widgets/Microphone.qml | 6 +++---
 Modules/Bar/Widgets/NightLight.qml | 2 +-
 Modules/Bar/Widgets/Volume.qml     | 6 +++---
 Modules/IPC/IPCManager.qml         | 2 +-
 Services/AudioService.qml          | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Modules/Bar/Widgets/Brightness.qml b/Modules/Bar/Widgets/Brightness.qml
index c436237..832412d 100644
--- a/Modules/Bar/Widgets/Brightness.qml
+++ b/Modules/Bar/Widgets/Brightness.qml
@@ -101,9 +101,9 @@ Item {
       }
     }
 
-    onClicked: {
+    onRightClicked: {
       var settingsPanel = PanelService.getPanel("settingsPanel")
-      settingsPanel.requestedTab = SettingsPanel.Tab.Brightness
+      settingsPanel.requestedTab = SettingsPanel.Tab.Display
       settingsPanel.open()
     }
   }
diff --git a/Modules/Bar/Widgets/Microphone.qml b/Modules/Bar/Widgets/Microphone.qml
index 747c3a3..c935df7 100644
--- a/Modules/Bar/Widgets/Microphone.qml
+++ b/Modules/Bar/Widgets/Microphone.qml
@@ -106,13 +106,13 @@ Item {
       }
     }
     onClicked: {
+      AudioService.setInputMuted(!AudioService.inputMuted)
+    }
+    onRightClicked: {
       var settingsPanel = PanelService.getPanel("settingsPanel")
       settingsPanel.requestedTab = SettingsPanel.Tab.Audio
       settingsPanel.open()
     }
-    onRightClicked: {
-      AudioService.setInputMuted(!AudioService.inputMuted)
-    }
     onMiddleClicked: {
       Quickshell.execDetached(["pwvucontrol"])
     }
diff --git a/Modules/Bar/Widgets/NightLight.qml b/Modules/Bar/Widgets/NightLight.qml
index 9eab241..43028a1 100644
--- a/Modules/Bar/Widgets/NightLight.qml
+++ b/Modules/Bar/Widgets/NightLight.qml
@@ -36,7 +36,7 @@ NIconButton {
 
   onRightClicked: {
     var settingsPanel = PanelService.getPanel("settingsPanel")
-    settingsPanel.requestedTab = SettingsPanel.Tab.Brightness
+    settingsPanel.requestedTab = SettingsPanel.Tab.Display
     settingsPanel.open()
   }
 }
diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml
index 2dfa42f..ba1a5dd 100644
--- a/Modules/Bar/Widgets/Volume.qml
+++ b/Modules/Bar/Widgets/Volume.qml
@@ -91,13 +91,13 @@ Item {
       }
     }
     onClicked: {
+      AudioService.setOutputMuted(!AudioService.muted)
+    }
+    onRightClicked: {
       var settingsPanel = PanelService.getPanel("settingsPanel")
       settingsPanel.requestedTab = SettingsPanel.Tab.Audio
       settingsPanel.open()
     }
-    onRightClicked: {
-      AudioService.setMuted(!AudioService.muted)
-    }
     onMiddleClicked: {
       Quickshell.execDetached(["pwvucontrol"])
     }
diff --git a/Modules/IPC/IPCManager.qml b/Modules/IPC/IPCManager.qml
index d8eaf49..e9bfac5 100644
--- a/Modules/IPC/IPCManager.qml
+++ b/Modules/IPC/IPCManager.qml
@@ -99,7 +99,7 @@ Item {
       AudioService.decreaseVolume()
     }
     function muteOutput() {
-      AudioService.setMuted(!AudioService.muted)
+      AudioService.setOutputMuted(!AudioService.muted)
     }
     function muteInput() {
       if (AudioService.source?.ready && AudioService.source?.audio) {
diff --git a/Services/AudioService.qml b/Services/AudioService.qml
index 9f526ea..87f4322 100644
--- a/Services/AudioService.qml
+++ b/Services/AudioService.qml
@@ -105,7 +105,7 @@ Singleton {
     }
   }
 
-  function setMuted(muted: bool) {
+  function setOutputMuted(muted: bool) {
     if (sink?.ready && sink?.audio) {
       sink.audio.muted = muted
     } else {