dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ResizeToFit flag should now work for bitmap controls too

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2684 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-06-27 12:48:52 +00:00
parent 6567383d6e
commit c3fb01e1d4
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -935,7 +935,7 @@ int createCfgDlg()
DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON, DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON,
0 }, 0 },
{ "STATIC", // FIELD_BITMAP { "STATIC", // FIELD_BITMAP
DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_BITMAP, DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_BITMAP | SS_CENTERIMAGE,
0 }, 0 },
{ "BUTTON", // FIELD_BROWSEBUTTON { "BUTTON", // FIELD_BROWSEBUTTON
DEFAULT_STYLES | WS_TABSTOP, DEFAULT_STYLES | WS_TABSTOP,
@ -1136,12 +1136,12 @@ int createCfgDlg()
0, 0,
pFields[nIdx].pszText, pFields[nIdx].pszText,
nImageType, nImageType,
(pFields[nIdx].rect.right - pFields[nIdx].rect.left > 0 && !(pFields[nIdx].nFlags & FLAG_RESIZETOFIT)) (pFields[nIdx].nFlags & FLAG_RESIZETOFIT)
? (pFields[nIdx].rect.right - pFields[nIdx].rect.left) ? (rect.right - rect.left)
: (rect.right - rect.left), : 0,
(pFields[nIdx].rect.right - pFields[nIdx].rect.left > 0 && !(pFields[nIdx].nFlags & FLAG_RESIZETOFIT)) (pFields[nIdx].nFlags & FLAG_RESIZETOFIT)
? (pFields[nIdx].rect.bottom - pFields[nIdx].rect.top) ? (rect.bottom - rect.top)
: (rect.bottom - rect.top), : 0,
LR_LOADFROMFILE LR_LOADFROMFILE
); );
nImage = (LPARAM)pFields[nIdx].hImage; nImage = (LPARAM)pFields[nIdx].hImage;
@ -1155,7 +1155,6 @@ int createCfgDlg()
nImage nImage
); );
} else if (nType == FIELD_LINK){ } else if (nType == FIELD_LINK){
pFields[nIdx].nParentIdx = SetWindowLong(hwCtrl, GWL_WNDPROC, (long)StaticLINKWindowProc); pFields[nIdx].nParentIdx = SetWindowLong(hwCtrl, GWL_WNDPROC, (long)StaticLINKWindowProc);
} }
} }

BIN
Plugins/InstallOptions.dll
View file

Binary file not shown.