Fixed hidden controls in header if welcome page is skipped
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3030 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
294c7abc60
commit
276cde7ee7
1 changed files with 16 additions and 16 deletions
|
@ -1100,6 +1100,22 @@ Var MUI_TEMP2
|
||||||
|
|
||||||
Function "${PRE}"
|
Function "${PRE}"
|
||||||
|
|
||||||
|
!ifndef MUI_WELCOMEPAGE_TITLE
|
||||||
|
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_INFO_TITLE)"
|
||||||
|
!else
|
||||||
|
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_WELCOMEPAGE_TITLE}"
|
||||||
|
!undef MUI_WELCOMEPAGE_TITLE
|
||||||
|
!endif
|
||||||
|
|
||||||
|
!ifndef MUI_WELCOMEPAGE_TEXT
|
||||||
|
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO_TEXT)"
|
||||||
|
!else
|
||||||
|
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "${MUI_WELCOMEPAGE_TEXT}"
|
||||||
|
!undef MUI_WELCOMEPAGE_TEXT
|
||||||
|
!endif
|
||||||
|
|
||||||
|
!insertmacro MUI_FUNCTION_CUSTOM PRE
|
||||||
|
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
|
||||||
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
ShowWindow $MUI_TEMP1 ${SW_HIDE}
|
||||||
|
|
||||||
|
@ -1118,22 +1134,6 @@ Var MUI_TEMP2
|
||||||
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
|
||||||
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
ShowWindow $MUI_TEMP1 ${SW_NORMAL}
|
||||||
|
|
||||||
!ifndef MUI_WELCOMEPAGE_TITLE
|
|
||||||
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_INFO_TITLE)"
|
|
||||||
!else
|
|
||||||
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_WELCOMEPAGE_TITLE}"
|
|
||||||
!undef MUI_WELCOMEPAGE_TITLE
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!ifndef MUI_WELCOMEPAGE_TEXT
|
|
||||||
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO_TEXT)"
|
|
||||||
!else
|
|
||||||
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "${MUI_WELCOMEPAGE_TEXT}"
|
|
||||||
!undef MUI_WELCOMEPAGE_TEXT
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!insertmacro MUI_FUNCTION_CUSTOM PRE
|
|
||||||
|
|
||||||
!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini"
|
!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini"
|
||||||
Pop $MUI_HWND
|
Pop $MUI_HWND
|
||||||
SetCtlColors $MUI_HWND "" "${MUI_BGCOLOR}"
|
SetCtlColors $MUI_HWND "" "${MUI_BGCOLOR}"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue