Release.

MRGRD56 · Dec 5, 2020 · dde0a8f · dde0a8f
1 parent fcaa34e
commit dde0a8f
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 7 deletions.
diff --git a/FastVolumeFw/App.config b/FastVolumeFw/App.config
@@ -25,6 +25,9 @@
             <setting name="WindowRightMargin" serializeAs="String">
                 <value>30</value>
             </setting>
+            <setting name="MouseWheelVolumeChangeStep" serializeAs="String">
+                <value>2</value>
+            </setting>
         </FastVolumeFw.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/FastVolumeFw/Properties/Settings.Designer.cs b/FastVolumeFw/Properties/Settings.Designer.cs
diff --git a/FastVolumeFw/Properties/Settings.settings b/FastVolumeFw/Properties/Settings.settings
@@ -17,5 +17,8 @@
     <Setting Name="WindowRightMargin" Type="System.UInt32" Scope="User">
       <Value Profile="(Default)">30</Value>
     </Setting>
+    <Setting Name="MouseWheelVolumeChangeStep" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/FastVolumeFw/ViewModel/SettingsWindowVm.cs b/FastVolumeFw/ViewModel/SettingsWindowVm.cs
@@ -17,6 +17,7 @@ public class SettingsWindowVm : INotifyPropertyChanged
         private bool _unmuteWhileChangingVolume;
         private bool _volumeControlWithMouseWheel;
         private uint _windowRightMargin;
+        private uint _mouseWheelVolumeChangeStep;
 
         public bool IsAppDisabledInFullScreenMode
         {
@@ -96,13 +97,31 @@ public uint WindowRightMargin
             }
         }
 
+        public uint MouseWheelVolumeChangeStep
+        {
+            get => _mouseWheelVolumeChangeStep;
+            set
+            {
+                if (value < 1 || value > 10) return;
+
+                _mouseWheelVolumeChangeStep = value;
+                if (Default.MouseWheelVolumeChangeStep != value)
+                {
+                    Default.MouseWheelVolumeChangeStep = value;
+                    Default.Save();
+                }
+                OnPropertyChanged();
+            }
+        }
+
         public SettingsWindowVm()
         {
             IsAppDisabledInFullScreenMode = Default.IsAppDisabledInFullScreenMode;
             PlaySoundAfterVolumeChange = Default.PlaySoundAfterVolumeChange;
             UnmuteWhileChangingVolume = Default.UnmuteWhileChangingVolume;
             VolumeControlWithMouseWheel = Default.VolumeControlWithMouseWheel;
             WindowRightMargin = Default.WindowRightMargin;
+            MouseWheelVolumeChangeStep = Default.MouseWheelVolumeChangeStep;
         }
 
         public void RestoreDefaults()
@@ -112,6 +131,7 @@ public void RestoreDefaults()
             UnmuteWhileChangingVolume = true;
             VolumeControlWithMouseWheel = true;
             WindowRightMargin = 30;
+            MouseWheelVolumeChangeStep = 2;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;

diff --git a/FastVolumeFw/Windows/MainWindow.xaml.cs b/FastVolumeFw/Windows/MainWindow.xaml.cs
@@ -160,17 +160,19 @@ private void MainBorder_MouseWheel(object sender, MouseWheelEventArgs e)
             if (!Properties.Settings.Default.VolumeControlWithMouseWheel)
                 return;
 
+            var step = Properties.Settings.Default.MouseWheelVolumeChangeStep;
+
             if (e.Delta > 0)
             {
-                if (ViewModel.Volume <= 98)
-                    ViewModel.Volume += 2;
+                if (ViewModel.Volume <= 100 - step)
+                    ViewModel.Volume += (int) step;
                 else
                     ViewModel.Volume = 100;
             }
             else if (e.Delta < 0)
             {
-                if (ViewModel.Volume >= 2)
-                    ViewModel.Volume -= 2;
+                if (ViewModel.Volume >= step)
+                    ViewModel.Volume -= (int) step;
                 else
                     ViewModel.Volume = 0;
             }

diff --git a/FastVolumeFw/Windows/SettingsWindow.xaml b/FastVolumeFw/Windows/SettingsWindow.xaml
@@ -66,13 +66,20 @@
                 <Label Content="Enable volume control with the mouse wheel" ToolTip="When you move the mouse wheel within the application window, the volume changes."/>
             </StackPanel>
             <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140"/>
+                    <ColumnDefinition Width="210"/>
                     <ColumnDefinition Width="50"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Label Grid.Column="0" Content="Window right margin: " ToolTip="Offset of the main window from the right edge. Range: 0-100."/>
-                <TextBox Grid.Column="1" TextAlignment="Center" Text="{Binding WindowRightMargin, UpdateSourceTrigger=PropertyChanged}"/>
+                <Label Grid.Row="0" Grid.Column="0" Content="Mouse wheel volume change step: " ToolTip="Volume change step when adjusting with the mouse wheel. Range: 1-10."/>
+                <TextBox Grid.Row="0" Grid.Column="1" TextAlignment="Center" IsEnabled="{Binding VolumeControlWithMouseWheel}"
+                         Text="{Binding MouseWheelVolumeChangeStep, UpdateSourceTrigger=PropertyChanged}"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="Window right margin: " ToolTip="Offset of the main window from the right edge. Range: 0-100."/>
+                <TextBox Grid.Row="1" Grid.Column="1" TextAlignment="Center" Text="{Binding WindowRightMargin, UpdateSourceTrigger=PropertyChanged}"/>
             </Grid>
         </StackPanel>
         <StackPanel Grid.RowSpan="2" VerticalAlignment="Bottom" Margin="0,0,5,5" Width="135" HorizontalAlignment="Right">