feat(IParameter): Fixed setting, performance improve

1. Iparameter
2. Thread.Sleep
3. No lock

Author: lkytal

SmoothScroll/README.md

@@ -0,0 +1,73 @@
+# SmoothScroll
+
+[![AppVeyor](https://img.shields.io/appveyor/ci/lkytal/smoothscroll.svg?style=flat-square)](https://ci.appveyor.com/project/lkytal/smoothscroll)
+
+Smooth Scrolling for the Visual Studio 2013, 2015 and 2017.
+
+Install [Smooth Scrolling](https://marketplace.visualstudio.com/items?itemName=lkytal.SmoothScroll) via Visual Studio market.
+
+## VS2013 and VS2015 version
+
+Install [the special version](SmoothScroll/SmoothScroll_VS2013.vsix).
+
+## Additional features
+
+* Hold shift key to Scroll horizontally.
+* Hold Alt key to scroll text view by one page up/down.
+
+Let me know if you have questions or suggestions.
+
+Preview:
+![ScreenShot](SmoothScroll/Resources/smooth.gif)
+
+## Update Log
+
+* 3.2.0: Fixed setting no effect
+* 3.1.4: Add FPS option
+* 3.1.4: Fixed Option Page
+* 3.1.1: Fixed MPF dependency
+* 3.1.0: Fixed load error for VS2017
+* 3.0.1: Last version for VS2013 and VS2015
+* 3.0.0: Use async package for VS2019
+* 2.9.0: Tentatively support VS2019.
+* 2.8.4: Tentatively support horizontal mouse wheel.
+* 2.8.3: Fix smooth option.
+* 2.8.2: Adjust initial duration.
+* 2.8.1: Adjust duration.
+* 2.8.0: Adjust parameters; Support different speed lever.
+* 2.7.0: Performance enhancement.
+* 2.6.0: Stop scroll when mouse click; no longer require reopening editor after setting changed.
+* 2.5.3: Fix horizontal scroll directing.
+* 2.5.2: Silent speed up when beginning.
+* 2.5.0: Support for Visual Studio 2017.
+* 2.4.0: Adaptive scroll duration.
+* 2.3.2: Fixup improper dispose.
+* 2.3.1: Better algorithm.
+* 2.2.0: Smooth scrolling when horizontally.
+* 2.1.1: Refined algorithm.
+* 2.1.0: More flexible settings.
+* 2.0.5: Fixup for VS2013.
+* 2.0.4: First stage fixup for VS2013.
+* 2.0.0: Option page and additional features.
+* 1.3.0: Experiment support for Visual Studio 15.
+* 1.2.0: Scrolling algorithm improved.
+* 1.1.0: Scrolling interval changed.
+
+## My other extensions :
+
+- ### [BuiltinCmd](https://marketplace.visualstudio.com/items?itemName=lkytal.BuiltinCmd)
+- ### [StatusInfo](https://marketplace.visualstudio.com/items?itemName=lkytal.StatusInfo)
+- ### [AutoZoom](https://marketplace.visualstudio.com/items?itemName=lkytal.AutoZoom)
+  
+## My HomePage
+
+> [lkytal.github.io](https://lkytal.github.io)
+
+## Acknowledgment
+
+> <div>Icons made by <a href="http://www.flaticon.com/authors/vectors-market" title="Vectors Market">Vectors Market</a> from <a href="http://www.flaticon.com" title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>
+
+## Support on Beerpay
+Hey dude! Help me out for a couple of :beers:!
+
+[![Beerpay](https://beerpay.io/lkytal/SmoothScroll/badge.svg?style=beer-square)](https://beerpay.io/lkytal/SmoothScroll)  [![Beerpay](https://beerpay.io/lkytal/SmoothScroll/make-wish.svg?style=flat-square)](https://beerpay.io/lkytal/SmoothScroll?focus=wish)

SmoothScroll/SmoothScroll.csproj

@@ -120,6 +120,7 @@
     <None Include="app.config" />
     <None Include="Key.snk" />
     <None Include="packages.config" />
+    <None Include="README.md" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>

SmoothScroll/SmoothScrollProcessor.cs

@@ -9,8 +9,11 @@
 
 namespace SmoothScroll
 {
-	internal sealed class SmoothScrollProcessor : MouseProcessorBase
+	internal sealed class SmoothScrollProcessor : MouseProcessorBase, IParameters
 	{
+		public ScrollingSpeeds SpeedLever => SmoothScrollPackage.OptionsPage?.DurationRatio ?? ScrollingSpeeds.Normal;
+		public ScrollingFPS FPS => SmoothScrollPackage.OptionsPage?.FPS ?? ScrollingFPS.High;
+
 		private const int WM_MOUSEHWHEEL = 0x020E;
 
 		private readonly IWpfTextView wpfTextView;
@@ -20,17 +23,15 @@ internal sealed class SmoothScrollProcessor : MouseProcessorBase
 		private bool AltEnable => SmoothScrollPackage.OptionsPage?.AltEnable ?? true;
 		private bool SmoothEnable => SmoothScrollPackage.OptionsPage?.SmoothEnable ?? true;
 		private double DistanceRatio => SmoothScrollPackage.OptionsPage?.DistanceRatio ?? 1.1;
-		private ScrollingSpeeds SpeedLever => SmoothScrollPackage.OptionsPage?.DurationRatio ?? ScrollingSpeeds.Normal;
-		private ScrollingFPS FPS => SmoothScrollPackage.OptionsPage?.FPS ?? ScrollingFPS.High;
 
 		private readonly ScrollController verticalController, horizontalController;
 
 		internal SmoothScrollProcessor(IWpfTextView _wpfTextView)
 		{
 			this.wpfTextView = _wpfTextView;
 			var pageScroller = new PageScroller(wpfTextView);
-			verticalController = new ScrollController(pageScroller, ScrollingDirection.Vertical, FPS);
-			horizontalController = new ScrollController(pageScroller, ScrollingDirection.Horizontal, FPS);
+			verticalController = new ScrollController(pageScroller, this, ScrollingDirection.Vertical);
+			horizontalController = new ScrollController(pageScroller, this, ScrollingDirection.Horizontal);
 
 			wpfTextView.VisualElement.Loaded += (_, __) =>
 			{
@@ -79,7 +80,7 @@ private void PostScrollRequest(double distance, ScrollingDirection direction)
 			{
 				if (SmoothEnable && NativeMethods.IsMouseEvent())
 				{
-					verticalController.ScrollView(distance * DistanceRatio, SpeedLever);
+					verticalController.ScrollView(distance * DistanceRatio);
 				}
 				else
 				{
@@ -90,7 +91,7 @@ private void PostScrollRequest(double distance, ScrollingDirection direction)
 			{
 				if (SmoothEnable && NativeMethods.IsMouseEvent())
 				{
-					horizontalController.ScrollView(distance * DistanceRatio, SpeedLever);
+					horizontalController.ScrollView(distance * DistanceRatio);
 				}
 				else
 				{

SmoothScroll/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="C3E3372B-022D-4E19-BD83-EEDD6FA01E5C" Version="3.1.5" Language="en-US" Publisher="Lkytal" />
+        <Identity Id="C3E3372B-022D-4E19-BD83-EEDD6FA01E5C" Version="3.2.0" Language="en-US" Publisher="Lkytal" />
         <DisplayName>Smooth Scroll</DisplayName>
         <Description xml:space="preserve">Smooth Scroll for VS2017 and VS2019</Description>
         <MoreInfo>https://github.com/lkytal/SmoothScroll</MoreInfo>

TestWpf/MainWindow.xaml

@@ -1,17 +1,18 @@
 <Window x:Class="TestWpf.MainWindow"
-		xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-		xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:local="clr-namespace:TestWpf"
-		mc:Ignorable="d"
-		Title="MainWindow" Height="600" Width="600" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TestWpf"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="600" Width="600" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="997*"/>
+            <ColumnDefinition Width="auto"/>
             <ColumnDefinition Width="195*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
@@ -21,6 +22,16 @@
             <RadioButton x:Name="radioNormal" Padding="10" Content="Normal" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" IsChecked="True"></RadioButton>
             <RadioButton x:Name="radioFast" Padding="10" Content="Fast" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center"></RadioButton>
         </StackPanel>
-        <TextBox x:Name="textBox" Grid.Row="1" TextWrapping="NoWrap" HorizontalContentAlignment="Stretch" FontFamily="Consolas" FontSize="14" HorizontalScrollBarVisibility="Visible" Grid.ColumnSpan="2"/>
+
+
+        <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0" Grid.ColumnSpan="2">
+            <RadioButton x:Name="fvslow" Padding="10" VerticalContentAlignment="Center" Content="Very Slow" HorizontalContentAlignment="Stretch"/>
+            <RadioButton x:Name="fslow" Padding="10" Content="Slow" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center"></RadioButton>
+            <RadioButton x:Name="fnormal" Padding="10" VerticalContentAlignment="Center" Content="Normal" HorizontalContentAlignment="Stretch"  IsChecked="True"/>
+            <RadioButton x:Name="ffast" Padding="10" Content="Fast" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center"></RadioButton>
+            <RadioButton x:Name="fvfast" Padding="10" Content="Very Fast" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center"></RadioButton>
+        </StackPanel>
+
+        <TextBox x:Name="textBox" Grid.Row="2" TextWrapping="NoWrap" HorizontalContentAlignment="Stretch" FontFamily="Consolas" FontSize="14" HorizontalScrollBarVisibility="Visible" Grid.ColumnSpan="2"/>
     </Grid>
 </Window>

TestWpf/MainWindow.xaml.cs

@@ -21,8 +21,11 @@ namespace TestWpf
 	/// <summary>
 	/// MainWindow.xaml 的交互逻辑
 	/// </summary>
-	public partial class MainWindow : Window, IPageScroller
+	public partial class MainWindow : Window, IPageScroller, IParameters
 	{
+		public ScrollingSpeeds SpeedLever { get; set; }
+		public ScrollingFPS FPS { get; set; }
+
 		private const int WM_MOUSEHWHEEL = 0x020E;
 		private ScrollController vscrollController;
 		private ScrollController hscrollController;
@@ -34,8 +37,8 @@ public MainWindow()
 
 		private void Window_Loaded(object sender, RoutedEventArgs e)
 		{
-			vscrollController = new ScrollController(this, ScrollingDirection.Vertical, ScrollingFPS.High);
-			hscrollController = new ScrollController(this, ScrollingDirection.Horizontal, ScrollingFPS.High);
+			vscrollController = new ScrollController(this, this, ScrollingDirection.Vertical);
+			hscrollController = new ScrollController(this, this, ScrollingDirection.Horizontal);
 			textBox.PreviewMouseWheel += textBox_PreviewMouseWheel;
 			HwndSource source = PresentationSource.FromVisual(textBox) as HwndSource;
 			source?.AddHook(textBox_Hook);
@@ -69,18 +72,41 @@ public void Scroll(ScrollingDirection direction, double value)
 
 		private void Scroll(int delta, ScrollController controller)
 		{
-			var scrollingSpeeds = ScrollingSpeeds.Normal;
-
 			if (radioSlow.IsChecked ?? false)
 			{
-				scrollingSpeeds = ScrollingSpeeds.Slow;
+				SpeedLever = ScrollingSpeeds.Slow;
 			}
 			else if (radioFast.IsChecked ?? false)
 			{
-				scrollingSpeeds = ScrollingSpeeds.Fast;
+				SpeedLever = ScrollingSpeeds.Fast;
+			}
+			else
+			{
+				SpeedLever = ScrollingSpeeds.Normal;
+			}
+
+			if (fvslow.IsChecked ?? false)
+			{
+				FPS = ScrollingFPS.Very_Low;
+			}
+			else if (fslow.IsChecked ?? false)
+			{
+				FPS = ScrollingFPS.Low;
+			}
+			else if (fnormal.IsChecked ?? false)
+			{
+				FPS = ScrollingFPS.Normal;
+			}
+			else if (ffast.IsChecked ?? false)
+			{
+				FPS = ScrollingFPS.High;
+			}
+			else if (fvfast.IsChecked ?? false)
+			{
+				FPS = ScrollingFPS.Very_High;
 			}
 
-			controller.ScrollView(delta, scrollingSpeeds);
+			controller.ScrollView(delta);
 		}
 
 		private void textBox_PreviewMouseWheel(object sender, MouseWheelEventArgs e)

scrollController/IPageScroller.cs

@@ -5,11 +5,18 @@ public interface IPageScroller
 		void Scroll(ScrollingDirection direction, double value);
 	}
 
+	public interface IParameters
+	{
+		ScrollingSpeeds SpeedLever { get; }
+		ScrollingFPS FPS { get; }
+	}
+
 	public enum ScrollingSpeeds
 	{
 		Slow = 1,
 		Normal = 2,
-		Fast = 3
+		Fast = 3,
+		Very_Fast = 4,
 	}
 
 	public enum ScrollingDirection
@@ -20,10 +27,10 @@ public enum ScrollingDirection
 	}
 	public enum ScrollingFPS
 	{
-		None,
-		Low = 1,
-		Normal = 2,
-		High = 3,
-		Very_High = 4,
+		Very_Low = 1,
+		Low = 2,
+		Normal = 3,
+		High = 4,
+		Very_High = 5,
 	}
 }