Merge pull request #720 from emoacht/develop

emoacht · web-flow · commit 54e70cb1c481 · 2025-11-12T06:27:28.000+09:00
Develop
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,7 +1,7 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
      xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
-  <Package Name="Monitorian" Manufacturer="emoacht" Version="4.13.2"
+  <Package Name="Monitorian" Manufacturer="emoacht" Version="4.13.3"
            Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
     <SummaryInformation Description="Installer for Monitorian"/>
 
diff --git a/Source/Monitorian.Core/AppControllerCore.cs b/Source/Monitorian.Core/AppControllerCore.cs
@@ -497,8 +497,9 @@ protected virtual async Task UpdateMessageAsync(string deviceInstanceId, string
 
 	private void ReflectMouseWheel(int delta)
 	{
-		var monitor = SelectedMonitor;
-		if (monitor is not { IsTarget: true, IsControllable: true })
+		var monitor = Monitors.Prepend(SelectedMonitor)
+			.FirstOrDefault(x => x.IsTarget && x.IsControllable);
+		if (monitor is null)
 			return;
 
 		EnsureUnisonWorkable(monitor);
diff --git 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("4.13.2.0")]
-[assembly: AssemblyFileVersion("4.13.2.0")]
+[assembly: AssemblyVersion("4.13.3.0")]
+[assembly: AssemblyFileVersion("4.13.3.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test
diff --git a/Source/Monitorian.Core/ViewModels/MainWindowViewModel.cs b/Source/Monitorian.Core/ViewModels/MainWindowViewModel.cs
@@ -63,7 +63,7 @@ private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs
 					if (!MonitorsView.Cast<MonitorViewModel>().Any(x => x.IsSelected))
 					{
 						var monitor = MonitorsView.Cast<MonitorViewModel>()
-							.FirstOrDefault(x => string.Equals(x.DeviceInstanceId, Settings.SelectedDeviceInstanceId));
+							.FirstOrDefault(x => ReferenceEquals(x, _controller.SelectedMonitor));
 						if (monitor is not null)
 							monitor.IsSelected = true;
 					}
diff --git 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("4.13.2.0")]
-[assembly: AssemblyFileVersion("4.13.2.0")]
+[assembly: AssemblyVersion("4.13.3.0")]
+[assembly: AssemblyFileVersion("4.13.3.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Source/ScreenFrame/Helper/DpiScaleExtension.cs b/Source/ScreenFrame/Helper/DpiScaleExtension.cs
@@ -18,4 +18,10 @@ public static Matrix ToMatrix(this DpiScale a)
 		matrix.Scale(a.DpiScaleX, a.DpiScaleY);
 		return matrix;
 	}
+
+	public static bool TypesafeEquals(this DpiScale a, DpiScale b)
+	{
+		return (a.DpiScaleX == b.DpiScaleX)
+			&& (a.DpiScaleY == b.DpiScaleY);
+	}
 }
diff --git a/Source/ScreenFrame/Movers/WindowMover.cs b/Source/ScreenFrame/Movers/WindowMover.cs
@@ -49,7 +49,7 @@ protected virtual void OnSourceInitialized(object sender, EventArgs e)
 		_source?.AddHook(WndProc);
 
 		var dpi = VisualTreeHelperAddition.GetDpi(_window);
-		if (!dpi.Equals(VisualTreeHelperAddition.SystemDpi))
+		if (!dpi.TypesafeEquals(VisualTreeHelperAddition.SystemDpi))
 		{
 			AdjustWindow(dpi);
 		}
diff --git a/Source/ScreenFrame/NotifyIconContainer.cs b/Source/ScreenFrame/NotifyIconContainer.cs
@@ -3,6 +3,7 @@
 using System.Windows;
 using System.Windows.Forms;
 
+using ScreenFrame.Helper;
 using ScreenFrame.Watcher;
 
 namespace ScreenFrame;
@@ -175,7 +176,7 @@ private void HandleDpiChanged(ref Message m)
 	{
 		var oldDpi = _dpi;
 		_dpi = VisualTreeHelperAddition.ConvertToDpiScale(m.WParam);
-		if (!oldDpi.Equals(_dpi))
+		if (!oldDpi.TypesafeEquals(_dpi))
 		{
 			OnDpiChanged(oldDpi, _dpi);
 		}
@@ -189,7 +190,7 @@ private void CheckDpiChanged()
 
 		var oldDpi = _dpi;
 		_dpi = VisualTreeHelperAddition.GetDpi(iconRect.Location);
-		if (!oldDpi.Equals(_dpi))
+		if (!oldDpi.TypesafeEquals(_dpi))
 		{
 			OnDpiChanged(oldDpi, _dpi);
 		}
diff --git a/Source/ScreenFrame/Properties/AssemblyInfo.cs b/Source/ScreenFrame/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // 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.13.0.0")]
-[assembly: AssemblyFileVersion("4.13.0.0")]
+[assembly: AssemblyVersion("4.13.3.0")]
+[assembly: AssemblyFileVersion("4.13.3.0")]
 [assembly: NeutralResourcesLanguage("en-US")]

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs`
`63`	`63`	`if (!MonitorsView.Cast<MonitorViewModel>().Any(x => x.IsSelected))`
`64`	`64`	`{`
`65`	`65`	`var monitor = MonitorsView.Cast<MonitorViewModel>()`
`66`		`- .FirstOrDefault(x => string.Equals(x.DeviceInstanceId, Settings.SelectedDeviceInstanceId));`
	`66`	`+ .FirstOrDefault(x => ReferenceEquals(x, _controller.SelectedMonitor));`
`67`	`67`	`if (monitor is not null)`
`68`	`68`	`monitor.IsSelected = true;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,10 @@ public static Matrix ToMatrix(this DpiScale a)`
`18`	`18`	`matrix.Scale(a.DpiScaleX, a.DpiScaleY);`
`19`	`19`	`return matrix;`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ public static bool TypesafeEquals(this DpiScale a, DpiScale b)`
	`23`	`+ {`
	`24`	`+ return (a.DpiScaleX == b.DpiScaleX)`
	`25`	`+ && (a.DpiScaleY == b.DpiScaleY);`
	`26`	`+ }`
`21`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected virtual void OnSourceInitialized(object sender, EventArgs e)`
`49`	`49`	`_source?.AddHook(WndProc);`
`50`	`50`
`51`	`51`	`var dpi = VisualTreeHelperAddition.GetDpi(_window);`
`52`		`- if (!dpi.Equals(VisualTreeHelperAddition.SystemDpi))`
	`52`	`+ if (!dpi.TypesafeEquals(VisualTreeHelperAddition.SystemDpi))`
`53`	`53`	`{`
`54`	`54`	`AdjustWindow(dpi);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Windows;`
`4`	`4`	`using System.Windows.Forms;`
`5`	`5`
	`6`	`+using ScreenFrame.Helper;`
`6`	`7`	`using ScreenFrame.Watcher;`
`7`	`8`
`8`	`9`	`namespace ScreenFrame;`
`@@ -175,7 +176,7 @@ private void HandleDpiChanged(ref Message m)`
`175`	`176`	`{`
`176`	`177`	`var oldDpi = _dpi;`
`177`	`178`	`_dpi = VisualTreeHelperAddition.ConvertToDpiScale(m.WParam);`
`178`		`- if (!oldDpi.Equals(_dpi))`
	`179`	`+ if (!oldDpi.TypesafeEquals(_dpi))`
`179`	`180`	`{`
`180`	`181`	`OnDpiChanged(oldDpi, _dpi);`
`181`	`182`	`}`
`@@ -189,7 +190,7 @@ private void CheckDpiChanged()`
`189`	`190`
`190`	`191`	`var oldDpi = _dpi;`
`191`	`192`	`_dpi = VisualTreeHelperAddition.GetDpi(iconRect.Location);`
`192`		`- if (!oldDpi.Equals(_dpi))`
	`193`	`+ if (!oldDpi.TypesafeEquals(_dpi))`
`193`	`194`	`{`
`194`	`195`	`OnDpiChanged(oldDpi, _dpi);`
`195`	`196`	`}`