From 5af733d166e131a1e553d0094dd1a150855f2eab Mon Sep 17 00:00:00 2001
From: Verrickt <Adios_verrickt@hotmail.com>
Date: Thu, 25 Oct 2018 19:22:30 +0800
Subject: [PATCH 1/3] Declare per monitor DPI awareness

---
 QuickLook/app.manifest | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/QuickLook/app.manifest b/QuickLook/app.manifest
index dafc5ef..37036a7 100644
--- a/QuickLook/app.manifest
+++ b/QuickLook/app.manifest
@@ -49,13 +49,19 @@
        DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
        to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
        also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
-  <!--
+
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <!-- The combination of below two tags have the following effect : 1) Per-Monitor for >= Windows 10 Anniversary Update 2) System < Windows 10 Anniversary Update -->
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+        PerMonitor
+      </dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+        true
+      </dpiAware>
     </windowsSettings>
   </application>
-  -->
+
 
   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
   <!--

From 4d04f152fd4f2bc416e1d13b7e262be33135b971 Mon Sep 17 00:00:00 2001
From: Verrickt <Adios_verrickt@hotmail.com>
Date: Thu, 25 Oct 2018 19:23:04 +0800
Subject: [PATCH 2/3] Enable WPF's native scaling

---
 QuickLook/App.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/QuickLook/App.config b/QuickLook/App.config
index 01c325b..7030e0b 100644
--- a/QuickLook/App.config
+++ b/QuickLook/App.config
@@ -5,6 +5,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   <runtime>
+    <AppContextSwitchOverrides value = " Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
     <legacyCorruptedStateExceptionsPolicy enabled="true" />
     <legacyUnhandledExceptionPolicy enabled="1" />
   </runtime>

From 3de59702f475ded7317cdf78b6290a6868f1e8a3 Mon Sep 17 00:00:00 2001
From: Verrickt <Adios_verrickt@hotmail.com>
Date: Thu, 25 Oct 2018 19:36:46 +0800
Subject: [PATCH 3/3] Make HTML viewer and Markdown viewer per monitor DPI
 aware

---
 .../QuickLook.Plugin.HtmlViewer/WebpagePanel.cs     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs
index 66a1bb9..e60c373 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/WebpagePanel.cs
@@ -18,7 +18,9 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using System.Windows.Threading;
 using QuickLook.Common.Helpers;
 
@@ -28,7 +30,16 @@ namespace QuickLook.Plugin.HtmlViewer
     {
         public WebpagePanel()
         {
-            Zoom = (int) (100 * DpiHelper.GetCurrentScaleFactor().Vertical);
+            var factor = VisualTreeHelper.GetDpi(this);
+            Zoom = (int)(factor.DpiScaleX*100);
+        }
+
+        // adjust zoom when DPI changes.
+        protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
+        {
+            var ratio = newDpi.DpiScaleX / oldDpi.DpiScaleX;
+            Zoom = (int)(Zoom * ratio);
+            base.OnDpiChanged(oldDpi, newDpi);
         }
 
         public void LoadFile(string path)