From a99cda74d92eb2ecbb67ad05474b8d3f58113898 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 19 Jun 2005 21:04:18 +0000 Subject: [PATCH] fixed bug #1221772 - Welcome Page icon overlap git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4100 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index c56e378b..e8a0e79e 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -968,7 +968,7 @@ Var MUI_TEMP2 !insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_LOCATION !insertmacro MUI_UNSET MUI_FINISHPAGE_LINK_COLOR !insertmacro MUI_UNSET MUI_FINISHPAGE_NOREBOOTSUPPORT - + !insertmacro MUI_UNSET MUI_FINISHPAGE_ABORTWARNINGCHECK !verbose pop @@ -1162,6 +1162,9 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 ShowWindow $MUI_TEMP1 ${SW_HIDE} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039 + ShowWindow $MUI_TEMP1 ${SW_HIDE} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 ShowWindow $MUI_TEMP1 ${SW_NORMAL} LockWindow off @@ -1199,6 +1202,9 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 ShowWindow $MUI_TEMP1 ${SW_NORMAL} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039 + ShowWindow $MUI_TEMP1 ${SW_NORMAL} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 ShowWindow $MUI_TEMP1 ${SW_HIDE} LockWindow off @@ -1610,6 +1616,9 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 ShowWindow $MUI_TEMP1 ${SW_HIDE} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039 + ShowWindow $MUI_TEMP1 ${SW_HIDE} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 ShowWindow $MUI_TEMP1 ${SW_NORMAL} LockWindow off @@ -1700,6 +1709,9 @@ Var MUI_TEMP2 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038 ShowWindow $MUI_TEMP1 ${SW_NORMAL} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039 + ShowWindow $MUI_TEMP1 ${SW_NORMAL} + GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045 ShowWindow $MUI_TEMP1 ${SW_HIDE} LockWindow off @@ -1988,15 +2000,15 @@ Var MUI_TEMP2 !macro MUI_LANGDLL_SAVELANGUAGE !ifndef MUI_PAGE_UNINSTALLER - + IfAbort mui.langdllsavelanguage_abort - + !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE !endif - + mui.langdllsavelanguage_abort: - + !endif !macroend