Fixing #150

Restoring floating window position on multiple monitors uses wrong Point for Virtual Screen location
Dirkster99 · Apr 18, 2020 · fa6b62c · fa6b62c
1 parent 96262c4
commit fa6b62c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs b/source/Components/AvalonDock/Layout/ILayoutElementForFloatingWindowExtension.cs
@@ -42,7 +42,8 @@ internal static void KeepInsideNearestMonitor(this ILayoutElementForFloatingWind
 			if (SystemParameters.PrimaryScreenWidth == SystemParameters.VirtualScreenWidth &&
 				SystemParameters.PrimaryScreenHeight == SystemParameters.VirtualScreenHeight)
 			{
-				RECT primaryscreen = new RECT(0, 0, (int)SystemParameters.PrimaryScreenWidth, (int)SystemParameters.PrimaryScreenHeight);
+				RECT primaryscreen = new RECT((int)SystemParameters.VirtualScreenLeft, (int)SystemParameters.VirtualScreenTop,
+				                              (int)SystemParameters.PrimaryScreenWidth, (int)SystemParameters.PrimaryScreenHeight);
 
 				if (!RectanglesIntersect(normalPosition, primaryscreen))
 				{
@@ -60,7 +61,8 @@ internal static void KeepInsideNearestMonitor(this ILayoutElementForFloatingWind
 			}
 			else
 			{
-				RECT primaryscreen = new RECT(0, 0, (int)SystemParameters.VirtualScreenWidth, (int)SystemParameters.VirtualScreenHeight);
+				RECT primaryscreen = new RECT((int)SystemParameters.VirtualScreenLeft, (int)SystemParameters.VirtualScreenTop,
+				                              (int)SystemParameters.VirtualScreenWidth, (int)SystemParameters.VirtualScreenHeight);
 
 				if (!RectanglesIntersect(normalPosition, primaryscreen))
 				{