set installer to be DPI aware

This commit is contained in:
Stephen Birarda 2016-01-18 14:20:33 -08:00
parent 95ae7e2ba8
commit 2311627599

View file

@ -37,6 +37,7 @@
; Set name prior to inner loop so uninstaller has correct values
Name "@CPACK_NSIS_PACKAGE_NAME@"
BrandingText " "
ManifestDPIAware true
!ifdef INNER
!echo "Inner invocation" ; just to see what's going on
@ -679,7 +680,6 @@ FunctionEnd
ReserveFile "NSIS.InstallOptions.ini"
ReserveFile "@POST_INSTALL_OPTIONS_PATH@"
ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
;--------------------------------
;Installer Sections
@ -990,11 +990,6 @@ FunctionEnd
; determine admin versus local install
Function un.onInit
; manually set this process to DPI aware for fonts on high-dpi screens
${If} ${AtLeastWinVista}
System::Call 'user32::SetProcessDPIAware()'
${EndIf}
; In order for the uninstaller to be able to remove itself, we have to do some trickery here.
; If the $EXEPATH does not contain the $TEMP dir, this instance is not the copied one
; so we move it to the $TEMP dir and then execute the copied uninstaller.
@ -1220,11 +1215,6 @@ SectionEnd
Function .onInit
; manually set this process to DPI aware for fonts on high-dpi screens
${If} ${AtLeastWinVista}
System::Call 'user32::SetProcessDPIAware()'
${EndIf}
!ifdef INNER
; If INNER is defined, then we aren't supposed to do anything except write out
; the installer. This is better than processing a command line option as it means