From c3fb01e1d4f7772e82f2eb71a7787f644f397cb6 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 27 Jun 2003 12:48:52 +0000
Subject: [PATCH] ResizeToFit flag should now work for bitmap controls too

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2684 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/InstallOptions/InstallerOptions.cpp |  15 +++++++--------
 Plugins/InstallOptions.dll                  | Bin 13824 -> 13824 bytes
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index 159a1de2..6bf269bb 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -935,7 +935,7 @@ int createCfgDlg()
         DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON,
         0 },
       { "STATIC",       // FIELD_BITMAP
-        DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_BITMAP,
+        DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_BITMAP | SS_CENTERIMAGE,
         0 },
       { "BUTTON",       // FIELD_BROWSEBUTTON
         DEFAULT_STYLES | WS_TABSTOP,
@@ -1136,12 +1136,12 @@ int createCfgDlg()
             0,
             pFields[nIdx].pszText,
             nImageType,
-            (pFields[nIdx].rect.right - pFields[nIdx].rect.left > 0 && !(pFields[nIdx].nFlags & FLAG_RESIZETOFIT))
-              ? (pFields[nIdx].rect.right - pFields[nIdx].rect.left)
-              : (rect.right - rect.left),
-            (pFields[nIdx].rect.right - pFields[nIdx].rect.left > 0 && !(pFields[nIdx].nFlags & FLAG_RESIZETOFIT))
-              ? (pFields[nIdx].rect.bottom - pFields[nIdx].rect.top)
-              : (rect.bottom - rect.top),
+            (pFields[nIdx].nFlags & FLAG_RESIZETOFIT)
+              ? (rect.right - rect.left)
+              : 0,
+            (pFields[nIdx].nFlags & FLAG_RESIZETOFIT)
+              ? (rect.bottom - rect.top)
+              : 0,
             LR_LOADFROMFILE
           );
           nImage = (LPARAM)pFields[nIdx].hImage;
@@ -1155,7 +1155,6 @@ int createCfgDlg()
           nImage
         );
       } else if (nType == FIELD_LINK){
-
         pFields[nIdx].nParentIdx = SetWindowLong(hwCtrl, GWL_WNDPROC, (long)StaticLINKWindowProc);      
       }
     }
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index f3007732eb57253c8062d1902024c57a7ca1934b..1d454e5e456c5039a0a26cada3900d5ab8104217 100644
GIT binary patch
delta 2177
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
A&Hw-a

delta 2121
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
Kb!^R2H2(sv%CJ)a