From a97ffe0bd05159e2e5e779816ba71d8941714ec9 Mon Sep 17 00:00:00 2001
From: bitraid <bitraid@protonmail.ch>
Date: Wed, 13 Apr 2022 12:43:54 +0300
Subject: NSIS: Get interface colors from system.

Fixes #7112
---
 misc/nsis/qutebrowser.nsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/misc/nsis/qutebrowser.nsi b/misc/nsis/qutebrowser.nsi
index 51f3b623d..bfc9aa817 100755
--- a/misc/nsis/qutebrowser.nsi
+++ b/misc/nsis/qutebrowser.nsi
@@ -43,6 +43,9 @@ ShowUninstDetails hide
 !addplugindir /x86-unicode ".\plugins\x86-unicode"
 !addincludedir ".\include"
 
+!define MUI_BGCOLOR "SYSCLR:Window"
+!define MUI_TEXTCOLOR "SYSCLR:WindowText"
+
 !include MUI2.nsh
 !include NsisMultiUser.nsh
 !include StdUtils.nsh
-- 
cgit v1.2.3-54-g00ecf


From 6bf7907c195e7a36ca91098bb72b7352403967b0 Mon Sep 17 00:00:00 2001
From: bitraid <bitraid@protonmail.ch>
Date: Wed, 13 Apr 2022 12:54:26 +0300
Subject: NSIS: Base icon choices on previous install

Closes #7109
---
 misc/nsis/install.nsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/misc/nsis/install.nsh b/misc/nsis/install.nsh
index 9f0cdf446..8233ab5f0 100755
--- a/misc/nsis/install.nsh
+++ b/misc/nsis/install.nsh
@@ -542,8 +542,16 @@ Function PageInstallModeChangeMode
 FunctionEnd
 
 Function PageComponentsPre
-  GetDlgItem $0 $HWNDPARENT 1
-  SendMessage $0 ${BCM_SETSHIELD} 0 0 ; hide SHIELD (Windows Vista and above)
+  SendMessage $mui.Button.Next ${BCM_SETSHIELD} 0 0
+  StrCmpS $HasCurrentModeInstallation 0 +9
+  IfFileExists "$DESKTOP\${PRODUCT_NAME}.lnk" +4
+  SectionGetFlags ${SectionDesktopIcon} $1
+  IntOp $1 $1 & 0xFFFFFFFE
+  SectionSetFlags ${SectionDesktopIcon} $1
+  IfFileExists "$STARTMENU\${PRODUCT_NAME}.lnk" +4
+  SectionGetFlags ${SectionStartMenuIcon} $1
+  IntOp $1 $1 & 0xFFFFFFFE
+  SectionSetFlags ${SectionStartMenuIcon} $1
 FunctionEnd
 
 Function PageDirectoryPre
-- 
cgit v1.2.3-54-g00ecf