diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs index f43b4d23..8c665cbe 100644 --- a/Source/Installer/Product.wxs +++ b/Source/Installer/Product.wxs @@ -1,6 +1,6 @@  - 4 + ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll @@ -39,17 +40,16 @@ + + + - - - - - + diff --git a/Source/Monitorian.Core/Properties/AssemblyInfo.cs b/Source/Monitorian.Core/Properties/AssemblyInfo.cs index 7a865024..d5870d29 100644 --- a/Source/Monitorian.Core/Properties/AssemblyInfo.cs +++ b/Source/Monitorian.Core/Properties/AssemblyInfo.cs @@ -33,8 +33,8 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.5.0")] -[assembly: AssemblyFileVersion("2.7.5.0")] +[assembly: AssemblyVersion("2.8.0.0")] +[assembly: AssemblyFileVersion("2.8.0.0")] [assembly: NeutralResourcesLanguage("en-US")] // For unit test diff --git a/Source/Monitorian.Core/Views/Controls/Sliders/EnhancedSlider.cs b/Source/Monitorian.Core/Views/Controls/Sliders/EnhancedSlider.cs index 7298334b..d56d629e 100644 --- a/Source/Monitorian.Core/Views/Controls/Sliders/EnhancedSlider.cs +++ b/Source/Monitorian.Core/Views/Controls/Sliders/EnhancedSlider.cs @@ -299,7 +299,7 @@ protected override void OnManipulationCompleted(ManipulationCompletedEventArgs e #region MouseWheel - private const double ReductionFactor = 0.05; + public static int WheelFactor { get; set; } = 5; protected override void OnMouseWheel(MouseWheelEventArgs e) { @@ -311,7 +311,18 @@ protected override void OnMouseWheel(MouseWheelEventArgs e) if (e.Delta == 0) return; - var newValue = this.Value + e.Delta * ReductionFactor; + // The default wheel rotation delta (for one notch) is set at 120. + // This value is seen as WHEEL_DELTA and System.Windows.Input.Mouse.MouseWheelDeltaForOneLine. + // Although a wheel rotation delta is expressed in multiples or divisions of WHEEL_DELTA, + // usually, it will be a multiple of WHEEL_DELTA (+120/-120). + // Some explanations are provided in: + // WM_MOUSEWHEEL Message + // https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-mousewheel + // System.Windows.Forms.MouseEventArgs.Delta Property + // https://docs.microsoft.com/en-us/dotnet/api/system.windows.forms.mouseeventargs.delta + // + // Mouse.MouseWheelDeltaForOneLine should be casted to double in case the delta is smaller than 120. + var newValue = this.Value + (e.Delta / (double)Mouse.MouseWheelDeltaForOneLine * WheelFactor); UpdateValue(newValue); UpdateValueDeferred(); } diff --git a/Source/Monitorian.Supplement/Monitorian.Supplement.csproj b/Source/Monitorian.Supplement/Monitorian.Supplement.csproj index 2129b22a..db5ce094 100644 --- a/Source/Monitorian.Supplement/Monitorian.Supplement.csproj +++ b/Source/Monitorian.Supplement/Monitorian.Supplement.csproj @@ -36,21 +36,21 @@ bin\Release\Monitorian.Supplement.xml + + + + False $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll False - - - - - + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformVersion)\Windows.winmd False diff --git a/Source/Monitorian/Monitorian.csproj b/Source/Monitorian/Monitorian.csproj index 539ba93e..d15eea50 100644 --- a/Source/Monitorian/Monitorian.csproj +++ b/Source/Monitorian/Monitorian.csproj @@ -42,28 +42,28 @@ Properties\app.manifest + ..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll + + + + + - - - - - - 4.0 + + - - diff --git a/Source/Monitorian/Properties/AssemblyInfo.cs b/Source/Monitorian/Properties/AssemblyInfo.cs index 9de812cc..347fb486 100644 --- a/Source/Monitorian/Properties/AssemblyInfo.cs +++ b/Source/Monitorian/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.5.0")] -[assembly: AssemblyFileVersion("2.7.5.0")] +[assembly: AssemblyVersion("2.8.0.0")] +[assembly: AssemblyFileVersion("2.8.0.0")] [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/Source/ScreenFrame/ScreenFrame.csproj b/Source/ScreenFrame/ScreenFrame.csproj index aabef864..1125c940 100644 --- a/Source/ScreenFrame/ScreenFrame.csproj +++ b/Source/ScreenFrame/ScreenFrame.csproj @@ -33,20 +33,20 @@ bin\Release\ScreenFrame.xml + + + + - - - - - + diff --git a/Source/StartupAgency/StartupAgency.csproj b/Source/StartupAgency/StartupAgency.csproj index 78ed9c9a..6961bab5 100644 --- a/Source/StartupAgency/StartupAgency.csproj +++ b/Source/StartupAgency/StartupAgency.csproj @@ -33,16 +33,16 @@ bin\Release\StartupAgency.xml + - - - - - + + + + diff --git a/Source/StartupBridge/StartupBridge.csproj b/Source/StartupBridge/StartupBridge.csproj index 9c72be61..36d985e0 100644 --- a/Source/StartupBridge/StartupBridge.csproj +++ b/Source/StartupBridge/StartupBridge.csproj @@ -35,19 +35,19 @@ bin\Release\StartupBridge.xml + + + + False $(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll False - - - - - + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\$(TargetPlatformVersion)\Windows.winmd False