Update for multi monitor support for different screen resolutions

Ruben2776 · Jun 16, 2019 · f2d063f · f2d063f
1 parent 0e4d969
commit f2d063f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/PicView/MainWindow.xaml.cs b/PicView/MainWindow.xaml.cs
@@ -304,6 +304,8 @@ private void MainWindow_ContentRendered(object sender, EventArgs e)
             MouseMove += MainWindow_MouseMove;
             MouseLeave += MainWindow_MouseLeave;
 
+            Microsoft.Win32.SystemEvents.DisplaySettingsChanged += (x, y) => Pic(FolderIndex);
+
             #endregion Add events
 
             // Add Timers
@@ -840,6 +842,7 @@ private void Move(object sender, MouseButtonEventArgs e)
             }
         }
 
+
         /// <summary>
         /// Function made to restore and drag window from maximized windowstate
         /// </summary>
@@ -2430,7 +2433,6 @@ private void Zoom_img_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         }
 
         /// <summary>
-        /// Occurs when the users clicks on the img control
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -2682,17 +2684,28 @@ private void ZoomFit(double width, double height)
             double maxWidth, maxHeight;
             var interfaceHeight = 93; // TopBar + LowerBar height
 
+            var currentMonitor = System.Windows.Forms.Screen.FromHandle(new System.Windows.Interop.WindowInteropHelper(Application.Current.MainWindow).Handle);
+
+            //find out if our app is being scaled by the monitor
+            PresentationSource source = PresentationSource.FromVisual(Application.Current.MainWindow);
+            double dpiScaling = (source != null && source.CompositionTarget != null ? source.CompositionTarget.TransformFromDevice.M11 : 1);
+
+            //get the available area of the monitor
+            System.Drawing.Rectangle workArea = currentMonitor.WorkingArea;
+            var workAreaWidth = (int)Math.Floor(workArea.Width * dpiScaling);
+            var workAreaHeight = (int)Math.Floor(workArea.Height * dpiScaling);
+
             if (windowstyle)
             {
                 // Get max width and height, based on user's screen
-                maxWidth = Math.Min(SystemParameters.PrimaryScreenWidth - ComfySpace, width);
-                maxHeight = Math.Min((SystemParameters.FullPrimaryScreenHeight - interfaceHeight), height);
+                maxWidth = Math.Min(workAreaWidth - ComfySpace, width);
+                maxHeight = Math.Min((workAreaHeight - interfaceHeight), height);
             }
             else
             {
                 // Get max width and height, based on window size
-                maxWidth = Math.Min(Width, width);
-                maxHeight = Math.Min(Height - interfaceHeight, height);
+                maxWidth = Math.Min(workAreaWidth, width);
+                maxHeight = Math.Min(workAreaHeight - interfaceHeight, height);
             }
 
             AspectRatio = Math.Min((maxWidth / width), (maxHeight / height));
@@ -2735,7 +2748,7 @@ private void ZoomFit(double width, double height)
             }
             else
             {
-                if (Width - interfaceSize < interfaceSize)
+                if (workAreaWidth - interfaceSize < interfaceSize)
                     Bar.MaxWidth = interfaceSize;
                 else
                     Bar.MaxWidth = Width - interfaceSize;

diff --git a/PicView/PicVIew.csproj b/PicView/PicVIew.csproj
@@ -93,8 +93,8 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-Q16-HDRI-x64, Version=7.11.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
-      <HintPath>..\packages\Magick.NET-Q16-HDRI-x64.7.11.0\lib\net40\Magick.NET-Q16-HDRI-x64.dll</HintPath>
+    <Reference Include="Magick.NET-Q16-HDRI-x64, Version=7.13.1.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
+      <HintPath>..\packages\Magick.NET-Q16-HDRI-x64.7.13.1\lib\net40\Magick.NET-Q16-HDRI-x64.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
@@ -128,6 +128,7 @@
     </ApplicationDefinition>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="lib\ArchiveExtraction.cs" />
+    <Compile Include="lib\CheckScreenChanged.cs" />
     <Compile Include="lib\FileAssociation.cs" />
     <Compile Include="lib\FileFunctions.cs" />
     <Compile Include="lib\NativeMethods.cs" />
@@ -415,12 +416,12 @@
     </FileAssociation>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Magick.NET-Q16-HDRI-x64.7.11.0\build\net40\Magick.NET-Q16-HDRI-x64.targets" Condition="Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.11.0\build\net40\Magick.NET-Q16-HDRI-x64.targets')" />
+  <Import Project="..\packages\Magick.NET-Q16-HDRI-x64.7.13.1\build\net40\Magick.NET-Q16-HDRI-x64.targets" Condition="Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.13.1\build\net40\Magick.NET-Q16-HDRI-x64.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.11.0\build\net40\Magick.NET-Q16-HDRI-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q16-HDRI-x64.7.11.0\build\net40\Magick.NET-Q16-HDRI-x64.targets'))" />
+    <Error Condition="!Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.13.1\build\net40\Magick.NET-Q16-HDRI-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q16-HDRI-x64.7.13.1\build\net40\Magick.NET-Q16-HDRI-x64.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/PicView/lib/CheckScreenChanged.cs b/PicView/lib/CheckScreenChanged.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PicView.lib
+{
+    class CheckScreenChanged
+    {
+    }
+}
diff --git a/PicView/packages.config b/PicView/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Magick.NET-Q16-HDRI-x64" version="7.11.0" targetFramework="net472" />
+  <package id="Magick.NET-Q16-HDRI-x64" version="7.13.1" targetFramework="net472" />
   <package id="XamlAnimatedGif" version="1.2.1" targetFramework="net472" />
 </packages>