Merge d142fae into 7c08cf5

VeselovAlex · web-flow · commit 8cf134e3230d · 2022-07-18T06:15:12.000+10:00
diff --git a/source/core.py b/source/core.py
@@ -424,7 +424,12 @@ def main():
 	"""
 	log.debug("Core starting")
 
-	ctypes.windll.user32.SetProcessDPIAware()
+	if winVersion.getWinVer() >= winVersion.WIN10_1703:
+		ctypes.windll.user32.SetProcessDpiAwarenessContext(-4)  # DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2
+	elif winVersion.getWinVer() >= winVersion.WIN81:
+		ctypes.windll.shcore.SetProcessDpiAwareness(2)  # PROCESS_PER_MONITOR_DPI_AWARE
+	else:
+		ctypes.windll.user32.SetProcessDPIAware()
 
 	import config
 	if not globalVars.appArgs.configPath:
diff --git a/source/setup.py b/source/setup.py
@@ -32,7 +32,8 @@
 RT_MANIFEST = 24
 manifest_template = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
+		xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
 		<security>
 			<requestedPrivileges>
@@ -63,6 +64,16 @@
 			/>
 		</application> 
 	</compatibility>
+	<asmv3:application>
+		<asmv3:windowsSettings>
+			<dpiAware
+				xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"
+				>true/pm</dpiAware>
+			<dpiAwareness
+				xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings"
+				>PerMonitorV2, PerMonitor</dpiAwareness>
+		</asmv3:windowsSettings>
+	</asmv3:application>
 </assembly>
 """
 
