From 2dd28f5cc398c9545b03cd05cf1854f47fac93ad Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Sat, 19 Dec 2020 07:49:05 +1100
Subject: [PATCH] fix(windows): ensure win7 compat, extra

---
 windows/src/engine/keyman/UfrmKeyman7Main.pas | 4 +---
 windows/src/engine/keyman/debug-manifest.in   | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/windows/src/engine/keyman/UfrmKeyman7Main.pas b/windows/src/engine/keyman/UfrmKeyman7Main.pas
index 2e294b367c..bec5694443 100644
--- a/windows/src/engine/keyman/UfrmKeyman7Main.pas
+++ b/windows/src/engine/keyman/UfrmKeyman7Main.pas
@@ -1071,9 +1071,7 @@ var
         end
         else if not GetWindowRect(hwndSysTray, r) then
           r := TRect.Empty;
-      end
-      else
-        r := TRect.Empty;
+      end;
     end;
 
     // Align the menu according to the location of the taskbar
diff --git a/windows/src/engine/keyman/debug-manifest.in b/windows/src/engine/keyman/debug-manifest.in
index 30cd649514..a85ebeb610 100644
--- a/windows/src/engine/keyman/debug-manifest.in
+++ b/windows/src/engine/keyman/debug-manifest.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
 	<assemblyIdentity type="win32" name="keyman" version="$VersionWin" processorArchitecture="x86"/>
 	<description>Keyman Engine</description>
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -14,4 +14,10 @@
 			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
 		</dependentAssembly>
 	</dependency>
+	<!-- <asmv3:application> 
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>	-->
 </assembly>