From 47edc59c1cf901f90970d1f2d056de2a38c97855 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Thu, 24 Jan 2008 21:54:48 +0000 Subject: [PATCH] get image control size directly git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5490 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI 2/Pages/Finish.nsh | 6 +++--- Contrib/Modern UI 2/Pages/Welcome.nsh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Contrib/Modern UI 2/Pages/Finish.nsh b/Contrib/Modern UI 2/Pages/Finish.nsh index 1d4ac787..8a4f2ae8 100644 --- a/Contrib/Modern UI 2/Pages/Finish.nsh +++ b/Contrib/Modern UI 2/Pages/Finish.nsh @@ -270,9 +270,9 @@ Finish page (implemented using nsDialogs) ${NSD_CreateBitmap} 0u 0u 109u 193u "" Pop $mui.FinishPage.Image !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH - System::Call '*(i, i, i 109, i 193) i.s' - Pop $mui.FinishPage.Image.Rect - System::Call 'user32::MapDialogRect(i $HWNDPARENT, i $mui.FinishPage.Image.Rect)' + System::Call '*(i, i, i, i) i.s' + Pop $mui.FinishPage.Image.Rect + System::Call 'user32::GetClientRect(i $mui.FinishPage.Image, i $mui.FinishPage.Image.Rect)' System::Call '*$mui.FinishPage.Image.Rect(i, i, i, i) i (, , .s, .s)' Pop $mui.FinishPage.Image.Width Pop $mui.FinishPage.Image.Height diff --git a/Contrib/Modern UI 2/Pages/Welcome.nsh b/Contrib/Modern UI 2/Pages/Welcome.nsh index 8e69ea47..346579d0 100644 --- a/Contrib/Modern UI 2/Pages/Welcome.nsh +++ b/Contrib/Modern UI 2/Pages/Welcome.nsh @@ -132,9 +132,9 @@ Welcome page (implemented using nsDialogs) ${NSD_CreateBitmap} 0u 0u 109u 193u "" Pop $mui.WelcomePage.Image !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH - System::Call '*(i, i, i 109, i 193) i.s' - Pop $mui.WelcomePage.Image.Rect - System::Call 'user32::MapDialogRect(i $HWNDPARENT, i $mui.WelcomePage.Image.Rect)' + System::Call '*(i, i, i, i) i.s' + Pop $mui.WelcomePage.Image.Rect + System::Call 'user32::GetClientRect(i $mui.WelcomePage.Image, i $mui.WelcomePage.Image.Rect)' System::Call '*$mui.WelcomePage.Image.Rect(i, i, i, i) i (, , .s, .s)' Pop $mui.WelcomePage.Image.Width Pop $mui.WelcomePage.Image.Height