From 16f3d9e960c989821078ed227cfc175b5e6856d8 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 24 Jan 2008 18:50:56 +0000
Subject: [PATCH] fixed bug #1875945 - Image doesn't fit the window in MUI2
 with chinese language. Added support for MUI1
 MUI_(UN)WELCOMEFINISHPAGE_BITMAP_NOSTRETCH setting.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5485 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI 2/Pages/Finish.nsh  | 15 ++++++++++++++-
 Contrib/Modern UI 2/Pages/Welcome.nsh | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Contrib/Modern UI 2/Pages/Finish.nsh b/Contrib/Modern UI 2/Pages/Finish.nsh
index 369559b3..1d4ac787 100644
--- a/Contrib/Modern UI 2/Pages/Finish.nsh	
+++ b/Contrib/Modern UI 2/Pages/Finish.nsh	
@@ -16,6 +16,9 @@ Finish page (implemented using nsDialogs)
         
     Var mui.FinishPage.Image
     Var mui.FinishPage.Image.Bitmap
+    Var mui.FinishPage.Image.Rect
+    Var mui.FinishPage.Image.Width
+    Var mui.FinishPage.Image.Height    
     
     Var mui.FinishPage.Title
     Var mui.FinishPage.Title.Font
@@ -266,7 +269,17 @@ Finish page (implemented using nsDialogs)
     ;Image control
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.FinishPage.Image
-    System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s'
+    !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 '*$mui.FinishPage.Image.Rect(i, i, i, i) i (, , .s, .s)'
+      Pop $mui.FinishPage.Image.Width
+      Pop $mui.FinishPage.Image.Height
+      System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i $mui.FinishPage.Image.Width, i $mui.FinishPage.Image.Height, i ${LR_LOADFROMFILE}) i.s'
+    !else
+      System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s'
+    !endif    
     Pop $mui.FinishPage.Image.Bitmap
     SendMessage $mui.FinishPage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.FinishPage.Image.Bitmap
     
diff --git a/Contrib/Modern UI 2/Pages/Welcome.nsh b/Contrib/Modern UI 2/Pages/Welcome.nsh
index f45761e7..8e69ea47 100644
--- a/Contrib/Modern UI 2/Pages/Welcome.nsh	
+++ b/Contrib/Modern UI 2/Pages/Welcome.nsh	
@@ -16,6 +16,9 @@ Welcome page (implemented using nsDialogs)
         
     Var mui.WelcomePage.Image
     Var mui.WelcomePage.Image.Bitmap
+    Var mui.WelcomePage.Image.Rect
+    Var mui.WelcomePage.Image.Width
+    Var mui.WelcomePage.Image.Height
     
     Var mui.WelcomePage.Title
     Var mui.WelcomePage.Title.Font
@@ -128,7 +131,17 @@ Welcome page (implemented using nsDialogs)
     ;Image control
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.WelcomePage.Image
-    System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s'
+    !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 '*$mui.WelcomePage.Image.Rect(i, i, i, i) i (, , .s, .s)'
+      Pop $mui.WelcomePage.Image.Width
+      Pop $mui.WelcomePage.Image.Height
+      System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i $mui.WelcomePage.Image.Width, i $mui.WelcomePage.Image.Height, i ${LR_LOADFROMFILE}) i.s'
+    !else
+      System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s'
+    !endif
     Pop $mui.WelcomePage.Image.Bitmap
     SendMessage $mui.WelcomePage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.WelcomePage.Image.Bitmap