From 291af796a6f3cdc22af4366ed047686037c43066 Mon Sep 17 00:00:00 2001
From: CCondotti <c.condotti@nt2i.fr>
Date: Tue, 18 Feb 2025 16:51:16 +0100
Subject: [PATCH 1/3] force windowState to Normal. Rename Maximize to Fill to
 not confuse with WindowsState, add origin Size button on demo.

---
 src/WpfScreenHelper/Enum/WindowPositions.cs   |   2 +-
 src/WpfScreenHelper/WindowHelper.cs           |   4 +-
 src/WpfScreenHelper/WpfScreenHelper.csproj    |   7 +-
 .../MainWindow.xaml                           | 120 +++++++++++++++---
 .../MainWindow.xaml.cs                        |  12 +-
 5 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/src/WpfScreenHelper/Enum/WindowPositions.cs b/src/WpfScreenHelper/Enum/WindowPositions.cs
index 3067662..c329657 100644
--- a/src/WpfScreenHelper/Enum/WindowPositions.cs
+++ b/src/WpfScreenHelper/Enum/WindowPositions.cs
@@ -11,6 +11,6 @@ public enum WindowPositions
         TopRight,
         BottomRight,
         BottomLeft,
-        Maximize
+        Fill
     }
 }
diff --git a/src/WpfScreenHelper/WindowHelper.cs b/src/WpfScreenHelper/WindowHelper.cs
index 9511173..5b0babb 100644
--- a/src/WpfScreenHelper/WindowHelper.cs
+++ b/src/WpfScreenHelper/WindowHelper.cs
@@ -20,6 +20,8 @@ public static class WindowHelper
         /// <param name="height">New height of the window.</param>
         public static void SetWindowPosition(this Window window, int x, int y, int width, int height)
         {
+            //Force to normal to allow setting the window position
+            window.WindowState = WindowState.Normal;
             // The first move puts it on the correct monitor, which triggers WM_DPICHANGED
             // The +1/-1 coerces WPF to update Window.Top/Left/Width/Height in the second move
             NativeMethods.MoveWindow(new WindowInteropHelper(window).Handle, x - 1, y, width + 1, height, false);
@@ -135,7 +137,7 @@ private static Rect CalculateWindowCoordinates(FrameworkElement window, WindowPo
                         return new Rect(screen.WpfBounds.X * screen.ScaleFactor, y * screen.ScaleFactor, window.Width * screen.ScaleFactor, window.Height * screen.ScaleFactor);
                     }
 
-                case WindowPositions.Maximize:
+                case WindowPositions.Fill:
                     return new Rect(screen.WpfBounds.X * screen.ScaleFactor, screen.WpfBounds.Y * screen.ScaleFactor, screen.WpfBounds.Width * screen.ScaleFactor, screen.WpfBounds.Height * screen.ScaleFactor);
 
                 default:
diff --git a/src/WpfScreenHelper/WpfScreenHelper.csproj b/src/WpfScreenHelper/WpfScreenHelper.csproj
index 77d41b8..6f2fd85 100644
--- a/src/WpfScreenHelper/WpfScreenHelper.csproj
+++ b/src/WpfScreenHelper/WpfScreenHelper.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net40;net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net40;netcoreapp3.1;net6.0-windows;net8.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <AssemblyName>WpfScreenHelper</AssemblyName>
@@ -14,7 +14,8 @@
     <PackageTags>WPF Screen Monitor Display Helper</PackageTags>
     <RepositoryUrl>https://github.com/micdenny/WpfScreenHelper</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>2.1.1</Version>
+    <Version>2.2.1</Version>
+    <FileVersion>2023.2.21.3</FileVersion>
   </PropertyGroup>
 
   <Target Name="CopyPackage" AfterTargets="Pack">
diff --git a/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml b/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml
index 2d1835b..4254c5e 100644
--- a/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml
+++ b/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml
@@ -4,31 +4,111 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="MainWindow" Name="Wnd" 
-        Height="400" Width="700" SnapsToDevicePixels="True" WindowStyle="None" ResizeMode="NoResize"
-        Loaded="MainWindow_OnLoaded" MouseLeftButtonDown="MainWindow_OnMouseLeftButtonDown">
+        Title="MainWindow"
+        Name="Wnd"
+        Height="400"
+        Width="700"
+        SnapsToDevicePixels="True"
+        WindowStyle="None"
+        ResizeMode="NoResize"
+        Loaded="MainWindow_OnLoaded"
+        MouseLeftButtonDown="MainWindow_OnMouseLeftButtonDown">
     <Grid>
-        <StackPanel Orientation="Horizontal" Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Button Width="100" Height="50" Content="Position Maximize" Margin="5" Click="ButtonMaximize_OnClick"/>
-            <Button Width="100" Height="50" Content="Position Center"  Margin="5" Click="ButtonCenter_OnClick"/>
+        <StackPanel Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+
+                <Button Width="210"
+                        Height="50"
+                        Content="Position Center"
+                        Margin="5"
+                        Click="ButtonCenter_OnClick" />
+
+            <ComboBox Name="Monitors"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Top"
+                      Width="210" />
+            
+            <StackPanel Orientation="Horizontal">
+                <Button Width="100"
+                        Height="50"
+                        Content="Fill to Screen"
+                        Margin="5"
+                        Click="ButtonFillToScreen_OnClick" />
+                <Button Width="100"
+                        Height="50"
+                        Content="origine Size"
+                        Margin="5"
+                        Click="ButtonOrigine_OnClick" />
+            </StackPanel>
         </StackPanel>
 
-        <Button Width="200" Height="50" Content="Position Left" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" Click="ButtonLeft_OnClick"/>
-        <Button Width="200" Height="50" Content="Position Right" Margin="5" HorizontalAlignment="Right" VerticalAlignment="Center" Click="ButtonRight_OnClick"/>
-        <Button Width="200" Height="50" Content="Position Top" Margin="5" HorizontalAlignment="Center" VerticalAlignment="Top" Click="ButtonTop_OnClick"/>
-        <Button Width="200" Height="50" Content="Position Bottom" Margin="5" HorizontalAlignment="Center" VerticalAlignment="Bottom" Click="ButtonBottom_OnClick"/>
-        <Button Width="200" Height="50" Content="Position TopLeft" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Top" Click="ButtonTopLeft_OnClick"/>
-        <Button Width="200" Height="50" Content="Position TopRight" Margin="5" HorizontalAlignment="Right" VerticalAlignment="Top" Click="ButtonTopRight_OnClick"/>
-        <Button Width="200" Height="50" Content="Position BottomRight" Margin="5" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="ButtonBottomRight_OnClick"/>
-        <Button Width="200" Height="50" Content="Position BottomLeft" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Bottom" Click="ButtonBottomLeft_OnClick"/>
+        <Button Width="200"
+                Height="50"
+                Content="Position Left"
+                Margin="5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Click="ButtonLeft_OnClick" />
+        <Button Width="200"
+                Height="50"
+                Content="Position Right"
+                Margin="5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Click="ButtonRight_OnClick" />
+        <Button Width="200"
+                Height="50"
+                Content="Position Top"
+                Margin="5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Top"
+                Click="ButtonTop_OnClick" />
+        <Button Width="200"
+                Height="50"
+                Content="Position Bottom"
+                Margin="5"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                Click="ButtonBottom_OnClick" />
+        <Button Width="200"
+                Height="50"
+                Content="Position TopLeft"
+                Margin="5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Click="ButtonTopLeft_OnClick" />
+        <Button Width="200"
+                Height="50"
+                Content="Position TopRight"
+                Margin="5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Click="ButtonTopRight_OnClick" />
+        <Button Width="200"
+                Height="50"
+                Content="Position BottomRight"
+                Margin="5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Bottom"
+                Click="ButtonBottomRight_OnClick" />
+        <Button Width="200"
+                Height="50"
+                Content="Position BottomLeft"
+                Margin="5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Bottom"
+                Click="ButtonBottomLeft_OnClick" />
 
-        <StackPanel HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5,0,0,70">
-            <TextBlock Text="{Binding ElementName=Wnd, Path=Width, StringFormat='Width: {0}'}"/>
-            <TextBlock Text="{Binding ElementName=Wnd, Path=Height, StringFormat='Height: {0}'}"/>
-            <TextBlock Text="{Binding ElementName=Wnd, Path=Left, StringFormat='Left: {0}'}"/>
-            <TextBlock Text="{Binding ElementName=Wnd, Path=Top, StringFormat='Top: {0}'}"/>
+        <StackPanel HorizontalAlignment="Left"
+                    VerticalAlignment="Bottom"
+                    Margin="5,0,0,70">
+            <TextBlock Text="{Binding ElementName=Wnd, Path=Width, StringFormat='Width: {0}'}" />
+            <TextBlock Text="{Binding ElementName=Wnd, Path=Height, StringFormat='Height: {0}'}" />
+            <TextBlock Text="{Binding ElementName=Wnd, Path=Left, StringFormat='Left: {0}'}" />
+            <TextBlock Text="{Binding ElementName=Wnd, Path=Top, StringFormat='Top: {0}'}" />
         </StackPanel>
 
-        <ComboBox Name="Monitors" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5"/>
+        
     </Grid>
 </Window>
diff --git a/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml.cs b/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml.cs
index 25da22b..0ccaa38 100644
--- a/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml.cs
+++ b/test/WpfScreenHelper.DpiTestWpfApp/MainWindow.xaml.cs
@@ -25,9 +25,9 @@ private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
             Monitors.SelectedIndex = 0;
         }
 
-        private void ButtonMaximize_OnClick(object sender, RoutedEventArgs e)
+        private void ButtonFillToScreen_OnClick(object sender, RoutedEventArgs e)
         {
-            this.SetWindowPosition(WindowPositions.Maximize, Screen.AllScreens.ElementAt(Monitors.SelectedIndex));
+            this.SetWindowPosition(WindowPositions.Fill, Screen.AllScreens.ElementAt(Monitors.SelectedIndex));
         }
 
         private void ButtonCenter_OnClick(object sender, RoutedEventArgs e)
@@ -79,5 +79,13 @@ private void MainWindow_OnMouseLeftButtonDown(object sender, MouseButtonEventArg
         {
             DragMove();
         }
+
+        private void ButtonOrigine_OnClick(object sender, RoutedEventArgs e)
+        {
+            this.Height = 400;
+            this.Width = 700;
+            this.SetWindowPosition(WindowPositions.Center, Screen.AllScreens.ElementAt(Monitors.SelectedIndex));
+
+        }
     }
 }
\ No newline at end of file

From e4fe3bcf21c982ba3ed6ca646714e70d0485bd8f Mon Sep 17 00:00:00 2001
From: CCondotti <c.condotti@nt2i.fr>
Date: Tue, 18 Feb 2025 16:51:50 +0100
Subject: [PATCH 2/3] Correct Plateform

---
 src/WpfScreenHelper/WpfScreenHelper.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WpfScreenHelper/WpfScreenHelper.csproj b/src/WpfScreenHelper/WpfScreenHelper.csproj
index 6f2fd85..fcb5ea0 100644
--- a/src/WpfScreenHelper/WpfScreenHelper.csproj
+++ b/src/WpfScreenHelper/WpfScreenHelper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net40;netcoreapp3.1;net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net40;net6.0-windows;net8.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <AssemblyName>WpfScreenHelper</AssemblyName>

From 292d5548cd596579eb3ff67ebdeb98fd41b0430f Mon Sep 17 00:00:00 2001
From: CCondotti <c.condotti@nt2i.fr>
Date: Tue, 18 Feb 2025 17:02:02 +0100
Subject: [PATCH 3/3] update version

---
 src/WpfScreenHelper/WpfScreenHelper.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WpfScreenHelper/WpfScreenHelper.csproj b/src/WpfScreenHelper/WpfScreenHelper.csproj
index fcb5ea0..c796181 100644
--- a/src/WpfScreenHelper/WpfScreenHelper.csproj
+++ b/src/WpfScreenHelper/WpfScreenHelper.csproj
@@ -15,7 +15,7 @@
     <RepositoryUrl>https://github.com/micdenny/WpfScreenHelper</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Version>2.2.1</Version>
-    <FileVersion>2023.2.21.3</FileVersion>
+    <FileVersion>2025.2.18.3</FileVersion>
   </PropertyGroup>
 
   <Target Name="CopyPackage" AfterTargets="Pack">