Merge pull request #41 from sergey-visual-studio/MouseWheelZoom

Added miscellaneous feature to control editor mouse wheel zoom.
sergey-visual-studio · Jul 3, 2022 · cf637a0 · cf637a0
2 parents 13377b3 + c5906c1
commit cf637a0
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 40 deletions.
diff --git a/DPackRx/Features/Miscellaneous/MouseWheelZoomListener.cs b/DPackRx/Features/Miscellaneous/MouseWheelZoomListener.cs
@@ -1,6 +1,8 @@
 using System.ComponentModel.Composition;
 
+using DPackRx.Options;
 using DPackRx.Services;
+using DPackRx.Extensions;
 
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
@@ -21,7 +23,10 @@ internal class MouseWheelZoomListener : IWpfTextViewCreationListener
 
 		public void TextViewCreated(IWpfTextView textView)
 		{
-			textView.Options.SetOptionValue<bool>(DefaultWpfViewOptions.EnableMouseWheelZoomId, false);
+			var optionsService = _serviceProvider?.GetService<IOptionsService>(false);
+			var mouseWheelZoom = optionsService != null && optionsService.GetBoolOption(KnownFeature.Miscellaneous, "MouseWheelZoom", false);
+
+			textView.Options.SetOptionValue<bool>(DefaultWpfViewOptions.EnableMouseWheelZoomId, mouseWheelZoom);
 		}
 
 		#endregion

diff --git a/DPackRx/Options/OptionsGeneral.cs b/DPackRx/Options/OptionsGeneral.cs
@@ -26,6 +26,7 @@ public class OptionsGeneral : OptionsBase
 		#region Fields
 
 		private bool _logging;
+		private bool _mouseWheelZoom;
 		private ICommand _assignShortcutsCommand;
 		private ICommand _loggingCommand;
 		private ICommand _logFolderCommand;
@@ -61,6 +62,16 @@ public bool Logging
 			}
 		}
 
+		public bool MouseWheelZoom
+		{
+			get { return _mouseWheelZoom; }
+			set
+			{
+				_mouseWheelZoom = value;
+				RaisePropertyChanged(nameof(this.MouseWheelZoom));
+			}
+		}
+
 		#endregion
 
 		#region Commands
@@ -132,6 +143,7 @@ protected override void OnLoad()
 			if (!this.Logging)
 				_logging = true;
 #endif
+			_mouseWheelZoom = this.OptionsService.GetBoolOption(KnownFeature.Miscellaneous, "MouseWheelZoom", false);
 
 			Refresh();
 		}
@@ -145,6 +157,8 @@ protected override void OnSave()
 
 			var log = this.ServiceProvider.GetService<ILog>();
 			log.Enabled = _logging;
+
+			this.OptionsService.SetBoolOption(KnownFeature.Miscellaneous, "MouseWheelZoom", _mouseWheelZoom);
 		}
 
 		#endregion
@@ -154,6 +168,7 @@ protected override void OnSave()
 		private void Refresh()
 		{
 			RaisePropertyChanged(nameof(this.Logging));
+			RaisePropertyChanged(nameof(this.MouseWheelZoom));
 		}
 
 		private void OnAssignShortcuts(object parameter)

diff --git a/DPackRx/Options/OptionsGeneralControl.xaml b/DPackRx/Options/OptionsGeneralControl.xaml
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:DPackRx.Options"
              xmlns:ui="clr-namespace:DPackRx.UI"
              mc:Ignorable="d"
-             d:DesignHeight="200" d:DesignWidth="400">
+             d:DesignHeight="260" d:DesignWidth="400">
 
     <UserControl.Resources>
         <ResourceDictionary>
@@ -17,24 +17,36 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <DockPanel LastChildFill="False">
-        <TextBlock DockPanel.Dock="Top" Style="{StaticResource TextBlockTop}" />
-
-        <Button DockPanel.Dock="Top" Content="Keyboard Shortcuts" ToolTip="Assign keyboard shortcuts" Style="{StaticResource ButtonRegular}" Margin="0"
-                Command="{Binding AssignShortcutsCommand}" />
-
-        <Border DockPanel.Dock="Top" Style="{StaticResource BorderDiv}" />
-
-        <CheckBox DockPanel.Dock="Top" Content="Enable Logging"
-                  IsEnabled="{Binding LoggingEnabled}"
-                  IsChecked="{Binding Logging}" Command="{Binding LoggingCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
-
-        <Button DockPanel.Dock="Top" Content="Open Log Folder" Style="{StaticResource ButtonRegular}"
-                Command="{Binding LogFolderCommand}" />
-
-        <Border DockPanel.Dock="Top" Style="{StaticResource BorderDiv}" />
-
-        <Button DockPanel.Dock="Top" Content="Reset All" ToolTip="Reset all settings" Style="{StaticResource ButtonRegular}"
-                Command="{Binding ResetAllCommand}" />
-    </DockPanel>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition MaxHeight="70" />
+            <RowDefinition MaxHeight="70" />
+            <RowDefinition MaxHeight="110" />
+        </Grid.RowDefinitions>
+
+        <GroupBox Header="Shortcuts">
+            <Button Content="Keyboard shortcuts" ToolTip="Assign keyboard shortcuts" Style="{StaticResource ButtonRegular}" Margin="4,4,0,0"
+                    Command="{Binding AssignShortcutsCommand}" />
+        </GroupBox>
+
+        <GroupBox Grid.Row="1" Header="Logging" Margin="0,16,0,0">
+            <CheckBox Content="Enable logging" Margin="4,12,0,0"
+                      IsEnabled="{Binding LoggingEnabled}"
+                      IsChecked="{Binding Logging}" Command="{Binding LoggingCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
+        </GroupBox>
+
+        <GroupBox Grid.Row="2" Header="Miscellaneous" Margin="0,16,0,0">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <CheckBox Content="Editor mouse wheel zoom" Margin="4,12,0,12"
+                          IsChecked="{Binding MouseWheelZoom}" />
+                <Button Grid.Row="1" Content="Reset all" ToolTip="Reset all settings" Style="{StaticResource ButtonRegular}" Margin="4,0,0,0"
+                        Command="{Binding ResetAllCommand}" />
+            </Grid>
+        </GroupBox>
+    </Grid>
 </UserControl>
diff --git a/DPackRx/UI/Styles/OptionsDictionary.xaml b/DPackRx/UI/Styles/OptionsDictionary.xaml
@@ -2,12 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:DPackRx.UI">
 
-    <Style x:Key="BorderDiv" TargetType="Border">
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Background" Value="Gray" />
-        <Setter Property="Margin" Value="0,12,0,0" />
-    </Style>
-
     <Style TargetType="CheckBox">
         <Setter Property="Margin" Value="0,12,0,0" />
     </Style>

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://dev.azure.com/sergey-visual-studio/dpack/_apis/build/status/sergey-visual-studio.dpack?branchName=master)](https://dev.azure.com/sergey-visual-studio/dpack/_build/latest?definitionId=1&branchName=master)
 
-[[What is DPack Rx]](#what-is-dpack-rx) [[What's included]](#what-features-are-included-so-far) [[Major changes]](#major-changes) [[Future plans]](#future-plans) [[Contribute]](#help-needed) [[Donate]](#donate)
+[[What is DPack Rx]](#what-is-dpack-rx) [[What's included]](#what-features-are-included-so-far) [[Major changes]](#major-changes) [[Future plans]](#future-plans) [[Contribute]](#help-needed)
 
 ### DPack Rx (former DPack)
 
@@ -51,14 +51,3 @@ Driving principal behind DPack design is fire-and-forget user experience with mi
 Thanks and enjoy.
 
 Sergey Mishkovskiy
-
-### Donate
-
-If you wish to express your appreciation 
-for the time and resources the authors have expended developing and supporting 
-DPack over the years, we do accept and appreciate donations.
-You can contribute via PayPal donate button below.
-
-Thank you for your support!
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif "Donate")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DXDC8CEJZRQLE&source=url)