Merge pull request #17 from brhinescot/support-high-dpi

Support high dpi
brhinescot · Apr 20, 2018 · 6c6169c · 6c6169c
2 parents 18c331a + 1a39648
commit 6c6169c
Show file tree

Hide file tree

Showing 31 changed files with 2,173 additions and 1,639 deletions.
diff --git a/src/Cropper.BmpFormat/Cropper.BmpFormat.csproj b/src/Cropper.BmpFormat/Cropper.BmpFormat.csproj
@@ -28,7 +28,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>

diff --git a/src/Cropper.ClipboardFormat/Cropper.ClipboardFormat.csproj b/src/Cropper.ClipboardFormat/Cropper.ClipboardFormat.csproj
@@ -28,7 +28,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -149,10 +149,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Skybound.VisualStyles, Version=2.0.0.0, Culture=neutral, PublicKeyToken=f2d73a45b3e75a83">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Skybound.VisualStyles.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>

diff --git a/src/Cropper.ClipboardFormat/Options.Designer.cs b/src/Cropper.ClipboardFormat/Options.Designer.cs
diff --git a/src/Cropper.ClipboardFormat/Options.cs b/src/Cropper.ClipboardFormat/Options.cs
@@ -1,6 +1,7 @@
 #region Using Directives
 
 using System;
+using System.Windows.Forms;
 using Fusion8.Cropper.Extensibility;
 
 #endregion
@@ -56,5 +57,15 @@ private void HandleQualitySliderValueChanged(object sender, EventArgs e)
         {
             imageQuality.Text = SR.ImageQuality(ImageQuality);
         }
+
+        protected override void OnDpiChanged(DpiChangedEventArgs e)
+        {
+            base.OnDpiChanged(e);
+        }
+
+        protected override void OnDpiChangedBeforeParent(EventArgs e)
+        {
+            base.OnDpiChangedBeforeParent(e);
+        }
     }
 }
diff --git a/src/Cropper.ClipboardFormat/Options.resx b/src/Cropper.ClipboardFormat/Options.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
diff --git a/src/Cropper.Core/ControlExtensions.cs b/src/Cropper.Core/ControlExtensions.cs
@@ -0,0 +1,30 @@
+#region Using Directives
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+
+#endregion
+
+namespace Fusion8.Cropper.Core
+{
+    public static class ControlExtensions
+    {
+        public static IEnumerable<Control> GetControlHierarchy(this Control root)
+        {
+            var queue = new Queue<Control>();
+
+            queue.Enqueue(root);
+
+            do
+            {
+                Control control = queue.Dequeue();
+
+                yield return control;
+
+                foreach (Control child in control.Controls.OfType<Control>())
+                    queue.Enqueue(child);
+            } while (queue.Count > 0);
+        }
+    }
+}
diff --git a/src/Cropper.Core/Cropper.Core.csproj b/src/Cropper.Core/Cropper.Core.csproj
@@ -28,7 +28,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -155,10 +155,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Skybound.VisualStyles">
-      <Name>skybound.visualstyles</Name>
-      <HintPath>..\..\lib\skybound.visualstyles.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
@@ -193,6 +189,7 @@
     <Compile Include="Configuration.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ControlExtensions.cs" />
     <Compile Include="CropSize.cs" />
     <Compile Include="DropDownButton.cs">
       <SubType>Component</SubType>