From 00a57ea972e106a21af6ea5b849e21013685a0e5 Mon Sep 17 00:00:00 2001
From: mipedja <mipedja@gmail.com>
Date: Thu, 6 Jan 2022 22:28:36 -0800
Subject: [PATCH] Restore dpiAwareness

Fixes regression from #304
Fixes #1462, possibly others.
---
 doc/newsfragments/restore-dpiawareness.bugfix |  1 +
 src/cmd/barrierc/CMakeLists.txt               |  4 +++-
 src/cmd/barrierc/barrierc.exe.manifest        | 16 ++++++++++++++++
 src/cmd/barriers/CMakeLists.txt               |  4 +++-
 src/cmd/barriers/barriers.exe.manifest        | 16 ++++++++++++++++
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 doc/newsfragments/restore-dpiawareness.bugfix
 create mode 100644 src/cmd/barrierc/barrierc.exe.manifest
 create mode 100644 src/cmd/barriers/barriers.exe.manifest

diff --git a/doc/newsfragments/restore-dpiawareness.bugfix b/doc/newsfragments/restore-dpiawareness.bugfix
new file mode 100644
index 00000000..29b5ddf9
--- /dev/null
+++ b/doc/newsfragments/restore-dpiawareness.bugfix
@@ -0,0 +1 @@
+Fixed a regression in 2.4.0 that caused Barrier to not support scaling other than 100% (https://github.com/debauchee/barrier/issues/1462).
\ No newline at end of file
diff --git a/src/cmd/barrierc/CMakeLists.txt b/src/cmd/barrierc/CMakeLists.txt
index 45e9ab0e..f887b043 100644
--- a/src/cmd/barrierc/CMakeLists.txt
+++ b/src/cmd/barrierc/CMakeLists.txt
@@ -21,7 +21,9 @@ set(sources
 if (WIN32)
     file(GLOB arch_headers "MSWindows*.h")
     file(GLOB arch_sources "MSWindows*.cpp")
-    list(APPEND sources barrierc.rc)
+    list(APPEND sources
+        barrierc.rc
+        barrierc.exe.manifest)
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")
     file(GLOB arch_sources "OSX*.cpp")
diff --git a/src/cmd/barrierc/barrierc.exe.manifest b/src/cmd/barrierc/barrierc.exe.manifest
new file mode 100644
index 00000000..255cef01
--- /dev/null
+++ b/src/cmd/barrierc/barrierc.exe.manifest
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+        </windowsSettings>
+    </application>
+</assembly>
\ No newline at end of file
diff --git a/src/cmd/barriers/CMakeLists.txt b/src/cmd/barriers/CMakeLists.txt
index c9fa7508..e0dc6a0b 100644
--- a/src/cmd/barriers/CMakeLists.txt
+++ b/src/cmd/barriers/CMakeLists.txt
@@ -21,7 +21,9 @@ set(sources
 if (WIN32)
     file(GLOB arch_headers "MSWindows*.h")
     file(GLOB arch_sources "MSWindows*.cpp")
-    list(APPEND sources barriers.rc)
+    list(APPEND sources
+        barriers.rc
+        barriers.exe.manifest)
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")
     file(GLOB arch_sources "OSX*.cpp")
diff --git a/src/cmd/barriers/barriers.exe.manifest b/src/cmd/barriers/barriers.exe.manifest
new file mode 100644
index 00000000..255cef01
--- /dev/null
+++ b/src/cmd/barriers/barriers.exe.manifest
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+        </windowsSettings>
+    </application>
+</assembly>
\ No newline at end of file