Merge pull request #1169 from unchihugo/fix/volume-flyout-activation

Update logic for volume flyout activation

Author: unchihugo

FluentFlyoutWPF/MainWindow.xaml.cs

@@ -919,11 +919,7 @@ private IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
                 if (mediaKeysPressed || (!SettingsManager.Current.MediaFlyoutVolumeKeysExcluded && volumeKeysPressed))
                     result = TryShowMediaFlyoutDebounced();
 
-                if (SettingsManager.Current.VolumeControlEnabled)
-                {
-                    volumeMixerWindow?.ViewModel.SyncMasterFromDevice();
-                    volumeMixerWindow?.ShowFlyout();
-                }
+                ShowVolumeFlyout();
 
                 if (!result)
                 {
@@ -974,6 +970,15 @@ private bool TryShowMediaFlyoutDebounced()
         return true;
     }
 
+    private void ShowVolumeFlyout()
+    {
+        if (!SettingsManager.Current.VolumeControlEnabled)
+            return;
+
+        volumeMixerWindow?.ViewModel.SyncMasterFromDevice();
+        volumeMixerWindow?.ShowFlyout();
+    }
+
     public async void ShowMediaFlyout(bool toggleMode = false, bool forceShow = false)
     {
         var activeSession = GetActiveMediaSession();
@@ -1709,18 +1714,13 @@ private nint WndProc(nint hwnd, int msg, nint wParam, nint lParam, ref bool hand
                 _ => false
             };
 
-            bool isVolumeCommand = false;
-
-            if (!isMediaCommand && !SettingsManager.Current.MediaFlyoutVolumeKeysExcluded)
+            bool isVolumeCommand = cmd switch
             {
-                isVolumeCommand = cmd switch
-                {
-                    APPCOMMAND_VOLUME_MUTE => true,
-                    APPCOMMAND_VOLUME_DOWN => true,
-                    APPCOMMAND_VOLUME_UP => true,
-                    _ => false
-                };
-            }
+                APPCOMMAND_VOLUME_MUTE => true,
+                APPCOMMAND_VOLUME_DOWN => true,
+                APPCOMMAND_VOLUME_UP => true,
+                _ => false
+            };
 
             if (!isMediaCommand && !isVolumeCommand)
                 return 0;
@@ -1730,9 +1730,14 @@ private nint WndProc(nint hwnd, int msg, nint wParam, nint lParam, ref bool hand
             if (!isKeyCommand)
                 return 0;
 
-            bool result = TryShowMediaFlyoutDebounced();
+            bool result = false;
+            if (isMediaCommand || (!SettingsManager.Current.MediaFlyoutVolumeKeysExcluded && isVolumeCommand))
+                result = TryShowMediaFlyoutDebounced();
+
+            if (isVolumeCommand)
+                ShowVolumeFlyout();
 
-            if (!result)
+            if (!result && !isVolumeCommand)
             {
                 return 0;
             }