From 45432d65d912e7d212c8abf58a4f100119edec44 Mon Sep 17 00:00:00 2001
From: jammie999 <18221758+jammie999@users.noreply.github.com>
Date: Wed, 15 May 2019 20:57:03 +0100
Subject: [PATCH] #6527 Added dpiAwareness PerMonitor to fix scaling in core on
 Windows, and also set window height to auto (0) which prevents elements being
 squashed in the config app

---
 src/cmd/synergyc/CMakeLists.txt        |  1 +
 src/cmd/synergyc/synergyc.exe.manifest | 17 +++++++++++++++++
 src/cmd/synergys/CMakeLists.txt        |  1 +
 src/cmd/synergys/synergys.exe.manifest | 17 +++++++++++++++++
 src/gui/src/MainWindowBase.ui          |  4 ++--
 5 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 src/cmd/synergyc/synergyc.exe.manifest
 create mode 100644 src/cmd/synergys/synergys.exe.manifest

diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index ed44ff69..f6a9cc32 100644
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -29,6 +29,7 @@ if (WIN32)
         tb_idle.ico
         tb_run.ico
         tb_wait.ico
+		synergyc.exe.manifest
     )
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")
diff --git a/src/cmd/synergyc/synergyc.exe.manifest b/src/cmd/synergyc/synergyc.exe.manifest
new file mode 100644
index 00000000..ecd2728a
--- /dev/null
+++ b/src/cmd/synergyc/synergyc.exe.manifest
@@ -0,0 +1,17 @@
+<?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>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt
index 4393455c..b099eaf4 100644
--- a/src/cmd/synergys/CMakeLists.txt
+++ b/src/cmd/synergys/CMakeLists.txt
@@ -29,6 +29,7 @@ if (WIN32)
         tb_idle.ico
         tb_run.ico
         tb_wait.ico
+		synergys.exe.manifest
     )
 elseif (APPLE)
     file(GLOB arch_headers "OSX*.h")
diff --git a/src/cmd/synergys/synergys.exe.manifest b/src/cmd/synergys/synergys.exe.manifest
new file mode 100644
index 00000000..ecd2728a
--- /dev/null
+++ b/src/cmd/synergys/synergys.exe.manifest
@@ -0,0 +1,17 @@
+<?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>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui
index 42f44dd6..a9345e26 100644
--- a/src/gui/src/MainWindowBase.ui
+++ b/src/gui/src/MainWindowBase.ui
@@ -18,8 +18,8 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>500</width>
-    <height>400</height>
+    <width>600</width>
+    <height>0</height>
    </size>
   </property>
   <property name="windowTitle">