From 870351dffdee509eac3648016639bd791b841df9 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Sat, 14 Feb 2004 19:41:51 +0000 Subject: [PATCH] background color for welcome/finish page bitmap not set when image is stretched git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3490 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 22e18837..2ab5fc7c 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -1,4 +1,4 @@ -;NSIS Modern User Interface version 1.69 +;NSIS Modern User Interface version 1.70 ;Macro System ;Written by Joost Verburg @@ -8,7 +8,7 @@ ;License: License.txt ;Examples: Examples\Modern UI -!echo "NSIS Modern User Interface version 1.69 - © 2002-2004 Joost Verburg" +!echo "NSIS Modern User Interface version 1.70 - © 2002-2004 Joost Verburg" ;-------------------------------- @@ -32,7 +32,7 @@ !include "WinMessages.nsh" !verbose pop -!define MUI_SYSVERSION "1.69" +!define MUI_SYSVERSION "1.70" Var MUI_TEMP1 Var MUI_TEMP2 @@ -1177,8 +1177,10 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $MUI_HWND 1202 SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" - GetDlgItem $MUI_TEMP1 $MUI_HWND 1200 - SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" + !ifdef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH + GetDlgItem $MUI_TEMP1 $MUI_HWND 1200 + SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" + !endif !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW @@ -1630,8 +1632,10 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $MUI_HWND 1202 SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" - GetDlgItem $MUI_TEMP1 $MUI_HWND 1200 - SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" + !ifdef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH + GetDlgItem $MUI_TEMP1 $MUI_HWND 1200 + SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" + !endif !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT