Merge pull request #502 from emoacht/develop

Develop

Author: emoacht

Source/Installer/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.8"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.9"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"

Source/Monitorian.Core/Models/Monitor/DisplayInformationProvider.cs

@@ -103,7 +103,7 @@ private void OnAdvancedColorInfoChanged(Windows.Graphics.Display.DisplayInformat
 						// to replace it with new one which is obtained after that change.
 						// In addition, if an event handler is unregistered within a callback of
 						// DispatcherQueueController.DispatcherQueue.TryEnqueue method, ArgumentException will be
-						// thrown saying Delegate to an instance method cannot have null 'this'
+						// thrown with a message: Delegate to an instance method cannot have null 'this'
 						sender.AdvancedColorInfoChanged -= OnAdvancedColorInfoChanged;
 						IsActive = false;
 					}

Source/Monitorian.Core/Models/Watcher/DisplayInformationWatcher.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows;
 
 using Monitorian.Core.Helper;
 using Monitorian.Core.Models.Monitor;

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("4.4.8.0")]
-[assembly: AssemblyFileVersion("4.4.8.0")]
+[assembly: AssemblyVersion("4.4.9.0")]
+[assembly: AssemblyFileVersion("4.4.9.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

Source/Monitorian.Core/Views/Controls/Sliders/RangeSlider.cs

@@ -37,6 +37,19 @@ public override void OnApplyTemplate()
 
 		#region Range
 
+		protected override void OnPreviewKeyDown(KeyEventArgs e)
+		{
+			switch (e.Key)
+			{
+				case Key.Left when (this.Value <= this.SelectionStart):
+				case Key.Right when (this.Value >= this.SelectionEnd):
+					// Stop movement by left or right arrow key.
+					e.Handled = true;
+					break;
+			}
+			base.OnPreviewKeyDown(e);
+		}
+
 		/// <summary>
 		/// Attempts to get the current level (from 0 to 1) within selected range. 
 		/// </summary>

Source/Monitorian.Core/Views/MainWindow.xaml

@@ -676,6 +676,7 @@
 													 Margin="12,0,4,0" VerticalAlignment="Center"
 													 Style="{StaticResource MainSliderHorizontal}"
 													 Minimum="0" Maximum="100"
+													 SmallChange="1"
 													 Value="{Binding Brightness, Mode=TwoWay, Delay=50}"
 													 DefersUpdateSource="{Binding Settings.DefersChange, Mode=OneWay}"
 													 IsShadowVisible="{Binding Settings.ShowsAdjusted, Mode=OneWay}"
@@ -723,6 +724,7 @@
 													 Width="100" Margin="8,0,4,0" VerticalAlignment="Center"
 													 Style="{StaticResource SubSliderHorizontal}"
 													 Minimum="0" Maximum="100"
+													 SmallChange="1"
 													 Value="{Binding Contrast, Mode=TwoWay, Delay=50}"
 													 DefersUpdateSource="{Binding Settings.DefersChange, Mode=OneWay}"
 													 Visibility="{Binding IsContrastChanging, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverterKey}}">

Source/Monitorian.Test/MonitorConfigurationTest.cs

@@ -283,6 +283,19 @@ public void TestMonitorCapability_A2_1()
 			Assert.IsTrue(AreIncluded(vcpCodes, VcpCode.Temperature, 3, 5, 9));
 		}
 
+		[TestMethod]
+		public void TestMonitorCapability_A2_2()
+		{
+			// Acer XV272U KV
+			var source = @"(prot(monitor)type(LCD)model(ACER XV272UKV)cmds(01 02 03 07 0C E3 F3)vcp(04 10 12 14(05 06 08 0B) 16 18 1A 59 5A 5B 5C 5D 5E 60(0F 11 12) 62 6C 6E 70 8D 9B 9C 9D 9E 9F A0 D6 E0(00 04 05) E1(00 01 02) E2(00 01 02 03 05 06 07 0B 20 21 22) E3 E4 E5 E7(00 01 02) E8(00 01 02 03 04)) mswhql(1)asset_eep(40)mccs_ver(2.2))";
+			var (success, vcpCodes) = TestExtractVcpCodes(source);
+			Assert.IsTrue(success);
+			Assert.IsTrue(AreIncluded(vcpCodes, VcpCode.Luminance));
+			Assert.IsTrue(AreIncluded(vcpCodes, VcpCode.Contrast));
+			Assert.IsTrue(AreIncluded(vcpCodes, VcpCode.SpeakerVolume));
+			Assert.IsTrue(AreIncluded(vcpCodes, VcpCode.Temperature, 5, 6, 8));
+		}
+
 		[TestMethod]
 		public void TestMonitorCapability_A3_1()
 		{

Source/Monitorian.Test/Properties/AssemblyInfo.cs

@@ -16,5 +16,5 @@
 [assembly: Guid("338b3627-9128-45cf-92c2-86b04318c24b")]
 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.4.3.0")]
-[assembly: AssemblyFileVersion("4.4.3.0")]
+[assembly: AssemblyVersion("4.4.9.0")]
+[assembly: AssemblyFileVersion("4.4.9.0")]

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("4.4.8.0")]
-[assembly: AssemblyFileVersion("4.4.8.0")]
+[assembly: AssemblyVersion("4.4.9.0")]
+[assembly: AssemblyFileVersion("4.4.9.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]