Adjustable scroll wheel and hotkey delta

EarTrumpet/App.xaml.cs

@@ -189,7 +189,8 @@ private void TrayIconScrolled(object _, int wheelDelta)
         if (Settings.UseScrollWheelInTray && (!Settings.UseGlobalMouseWheelHook || _flyoutViewModel.State == FlyoutViewState.Hidden))
         {
             CollectionViewModel.Default?.IncrementVolume(
-                Math.Sign(wheelDelta) * (Settings.UseLogarithmicVolume ? 0.2f : 2.0f));
+                Math.Sign(wheelDelta) *
+                (Settings.UseLogarithmicVolume ? Settings.ScrollWheelOrHotkeyVolumeChangeDb : Settings.ScrollWheelOrHotkeyVolumeChangePercent));
         }
     }
 
@@ -411,18 +412,17 @@ private void AbsoluteVolumeIncrement()
         foreach (var device in CollectionViewModel.AllDevices.Where(d => !d.IsMuted || d.IsAbsMuted))
         {
             device.IsAbsMuted = false;
-            device.IncrementVolume(2);
+            device.Volume += Settings.UseLogarithmicVolume ? Settings.ScrollWheelOrHotkeyVolumeChangeDb : Settings.ScrollWheelOrHotkeyVolumeChangePercent;
         }
     }
 
     private void AbsoluteVolumeDecrement()
     {
         foreach (var device in CollectionViewModel.AllDevices.Where(d => !d.IsMuted))
         {
-            var wasMuted = device.IsMuted;
-            device.Volume -= 2;
+            device.Volume -= Settings.UseLogarithmicVolume ? Settings.ScrollWheelOrHotkeyVolumeChangeDb : Settings.ScrollWheelOrHotkeyVolumeChangePercent;
 
-            if (!wasMuted == (device.Volume <= 0))
+            if (device.Volume <= (Settings.UseLogarithmicVolume ? Settings.LogarithmicVolumeMinDb : 0.0f))
             {
                 device.IsAbsMuted = true;
             }

EarTrumpet/AppSettings.cs

@@ -140,6 +140,18 @@ public bool UseScrollWheelInTray
         set => _settings.Set("UseScrollWheelInTray", value);
     }
 
+    public int ScrollWheelOrHotkeyVolumeChangePercent
+    {
+        get => _settings.Get("ScrollWheelOrHotkeyVolumeChangePercent", 2);
+        set => _settings.Set("ScrollWheelOrHotkeyVolumeChangePercent", value);
+    }
+
+    public float ScrollWheelOrHotkeyVolumeChangeDb
+    {
+        get => _settings.Get("ScrollWheelOrHotkeyVolumeChangeDb", 0.5f);
+        set => _settings.Set("ScrollWheelOrHotkeyVolumeChangeDb", value);
+    }
+
     public bool UseGlobalMouseWheelHook
     {
         get => _settings.Get("UseGlobalMouseWheelHook", false);

EarTrumpet/Properties/Resources.resx

@@ -685,4 +685,7 @@ Open [https://eartrumpet.app/jmp/fixstartup] to resolve this?</value>
   <data name="VolumeUnit_Decibel" xml:space="preserve">
     <value>dB</value>
   </data>
+  <data name="SettingsScrollWheelOrHotkeyVolumeChange" xml:space="preserve">
+    <value>Volume change amount for each wheel scroll or hotkey press</value>
+  </data>
 </root>

EarTrumpet/Properties/Resources.zh-CN.resx

@@ -679,4 +679,7 @@
   <data name="SettingsLogarithmicScaleMinimum" xml:space="preserve">
     <value>对数音量刻度最小值</value>
   </data>
+  <data name="SettingsScrollWheelOrHotkeyVolumeChange" xml:space="preserve">
+    <value>滚动滚轮或按下快捷键时的音量变化幅度</value>
+  </data>
 </root>

EarTrumpet/UI/Controls/VolumeSlider.cs

@@ -202,7 +202,8 @@ private void OnMouseMove(object sender, MouseEventArgs e)
 
     private void OnMouseWheel(object sender, MouseWheelEventArgs e)
     {
-        var amount = Math.Sign(e.Delta) * (App.Settings.UseLogarithmicVolume ? 0.2 : 2.0);
+        var amount = Math.Sign(e.Delta) *
+            (App.Settings.UseLogarithmicVolume ? App.Settings.ScrollWheelOrHotkeyVolumeChangeDb : App.Settings.ScrollWheelOrHotkeyVolumeChangePercent);
         ChangePositionByAmount(amount);
         e.Handled = true;
     }

EarTrumpet/UI/Converters/NegateConverter.cs

@@ -7,6 +7,7 @@ public class NegateConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
+            if (value is bool b) return !b;
             if (value is double d) return -d;
             if (value is float f) return (double)-f;
             if (value is int i) return (double)-i;
@@ -15,6 +16,7 @@ public object Convert(object value, Type targetType, object parameter, System.Gl
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
+            if (value is bool b) return !b;
             if (value is double d) return -d;
             throw new InvalidOperationException();
         }

EarTrumpet/UI/ViewModels/EarTrumpetCommunitySettingsPageViewModel.cs

@@ -1,4 +1,6 @@
-namespace EarTrumpet.UI.ViewModels;
+using System;
+
+namespace EarTrumpet.UI.ViewModels;
 
 public class EarTrumpetCommunitySettingsPageViewModel : SettingsPageViewModel
 {
@@ -29,6 +31,32 @@ public double LogarithmicVolumeMinDb
         }
     }
 
+    public double ScrollWheelOrHotkeyVolumeChangePercent
+    {
+        get => _settings.ScrollWheelOrHotkeyVolumeChangePercent;
+        set
+        {
+            if (_settings.ScrollWheelOrHotkeyVolumeChangePercent != (float)value)
+            {
+                _settings.ScrollWheelOrHotkeyVolumeChangePercent = (int)Math.Round(value);
+                RaisePropertyChanged(nameof(ScrollWheelOrHotkeyVolumeChangePercent));
+            }
+        }
+    }
+
+    public double ScrollWheelOrHotkeyVolumeChangeDb
+    {
+        get => _settings.ScrollWheelOrHotkeyVolumeChangeDb;
+        set
+        {
+            if (_settings.ScrollWheelOrHotkeyVolumeChangeDb != (float)value)
+            {
+                _settings.ScrollWheelOrHotkeyVolumeChangeDb = (float)value;
+                RaisePropertyChanged(nameof(ScrollWheelOrHotkeyVolumeChangeDb));
+            }
+        }
+    }
+
     public bool ShowFullMixerWindowOnStartup
     {
         get => _settings.ShowFullMixerWindowOnStartup;

EarTrumpet/UI/ViewModels/FlyoutViewModel.cs

@@ -326,7 +326,8 @@ private int OnMouseWheelEvent(object sender, System.Windows.Forms.MouseEventArgs
         {
             if (!_winRect.Contains(new Point(e.X, e.Y)))
             {
-                existing.IncrementVolume(Math.Sign(e.Delta) * 2);
+                existing.Volume += Math.Sign(e.Delta) *
+                    (App.Settings.UseLogarithmicVolume ? App.Settings.ScrollWheelOrHotkeyVolumeChangeDb : App.Settings.ScrollWheelOrHotkeyVolumeChangePercent);
                 return -1;
             }
         }

EarTrumpet/UI/Views/SettingsWindow.xaml

@@ -180,14 +180,12 @@
                           Content="{x:Static resx:Resources.SettingsUseLogarithmicVolume}"
                           IsChecked="{Binding UseLogarithmicVolume, Mode=TwoWay}" />
                 <StackPanel>
-                    <!-- Localization required -->
                     <TextBlock VerticalAlignment="Center"
                                Style="{StaticResource BodyText}"
                                Text="{x:Static resx:Resources.SettingsLogarithmicScaleMinimum}" />
                     <StackPanel Orientation="Horizontal"
                                 Margin="12,0,0,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Bottom">
+                                VerticalAlignment="Center">
                         <!--
                             -96 dB is the min volume range of most devices
                             -12 dB is arbitrarily chosen
@@ -202,7 +200,44 @@
                                 Value="{Binding LogarithmicVolumeMinDb, Converter={StaticResource NegateConverter}, Mode=TwoWay}" />
                         <TextBlock VerticalAlignment="Center"
                                    Style="{StaticResource BodyText}"
-                                   Text="{Binding LogarithmicVolumeMinDb, StringFormat=\{0\} dB}" />
+                                   Text="{Binding LogarithmicVolumeMinDb, StringFormat={}{0} dB}" />
+                    </StackPanel>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock VerticalAlignment="Center"
+                               Style="{StaticResource BodyText}"
+                               Text="{x:Static resx:Resources.SettingsScrollWheelOrHotkeyVolumeChange}" />
+                    <StackPanel Orientation="Horizontal"
+                                Margin="12,0,0,0"
+                                VerticalAlignment="Center">
+                        <Slider Minimum="1"
+                                Maximum="10"
+                                Width="200"
+                                IsEnabled="{Binding UseLogarithmicVolume, Converter={StaticResource NegateConverter}}"
+                                IsSnapToTickEnabled="True"
+                                SmallChange="1"
+                                LargeChange="1"
+                                TickFrequency="1"
+                                Value="{Binding ScrollWheelOrHotkeyVolumeChangePercent, Mode=TwoWay}" />
+                        <TextBlock VerticalAlignment="Center"
+                                   Style="{StaticResource BodyText}"
+                                   Text="{Binding ScrollWheelOrHotkeyVolumeChangePercent, StringFormat={}{0}%}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal"
+                                Margin="12,0,0,0"
+                                VerticalAlignment="Center">
+                        <Slider Minimum="0.1"
+                                Maximum="5"
+                                Width="200"
+                                IsEnabled="{Binding UseLogarithmicVolume}"
+                                IsSnapToTickEnabled="True"
+                                SmallChange="0.1"
+                                LargeChange="0.5"
+                                TickFrequency="0.1"
+                                Value="{Binding ScrollWheelOrHotkeyVolumeChangeDb, Mode=TwoWay}" />
+                        <TextBlock VerticalAlignment="Center"
+                                   Style="{StaticResource BodyText}"
+                                   Text="{Binding ScrollWheelOrHotkeyVolumeChangeDb, StringFormat={}{0:F1} dB}" />
                     </StackPanel>
                 </StackPanel>
                 <CheckBox HorizontalAlignment="Left"