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

IO support for LINK control text color (TxtColor). Fixed problem with ClearType fonts in XP

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2752 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
ramon18 2003-07-19 00:42:13 +00:00
parent f7c1f0a43d
commit 6395ec3c8c
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -138,7 +138,7 @@ struct FieldType {
UINT nControlID; UINT nControlID;
int nParentIdx; // this is used by the filerequest and dirrequest controls, used to store original windowproc for LINK int nParentIdx; // this is used by the filerequest and dirrequest controls, used to store original windowproc for LINK
HANDLE hImage; // this is used by image/icon field to save the handle to the image HANDLE hImage; // this is used by image/icon field to save the handle to the image, or used by LINK control to store the color
}; };
// initial buffer size. buffers will grow as required. // initial buffer size. buffers will grow as required.
@ -666,6 +666,10 @@ bool ReadSettings(void) {
} }
} }
// Text color for LINK control, default is pure blue
//if (pFields[nIdx].nType == FIELD_LINK)
pFields[nIdx].hImage = (HANDLE)GetPrivateProfileInt(szField, "TxtColor", RGB(0,0,255), pszFilename);
pFields[nIdx].nControlID = 1200 + nIdx; pFields[nIdx].nControlID = 1200 + nIdx;
} }
@ -743,9 +747,6 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg,
HFONT OldFont; HFONT OldFont;
LOGFONT lf; LOGFONT lf;
#endif #endif
if ( ( lpdis->itemState & ODS_FOCUS && lpdis->itemAction & ODA_DRAWENTIRE) || (lpdis->itemAction & ODA_FOCUS) ||
(lpdis->itemAction & ODA_SELECT))
DrawFocusRect(lpdis->hDC, &pFields[nIdx].rect);
#ifdef IO_LINK_UNDERLINED #ifdef IO_LINK_UNDERLINED
GetObject(GetCurrentObject(lpdis->hDC, OBJ_FONT), sizeof(lf), &lf); GetObject(GetCurrentObject(lpdis->hDC, OBJ_FONT), sizeof(lf), &lf);
@ -753,12 +754,15 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg,
OldFont = (HFONT)SelectObject(lpdis->hDC, CreateFontIndirect(&lf)); OldFont = (HFONT)SelectObject(lpdis->hDC, CreateFontIndirect(&lf));
#endif #endif
// Set up tranparent background // Set up tranparent background
SetBkMode(lpdis->hDC, TRANSPARENT); HBRUSH brush = (HBRUSH)GetWindowLong(lpdis->hwndItem, GWL_USERDATA);
if ( brush )
if ( GetSysColorBrush(COLOR_HOTLIGHT) ) FillRect(lpdis->hDC, &lpdis->rcItem, brush);
SetTextColor(lpdis->hDC, GetSysColor(COLOR_HOTLIGHT));
else if ( ( lpdis->itemState & ODS_FOCUS && lpdis->itemAction & ODA_DRAWENTIRE) || (lpdis->itemAction & ODA_FOCUS) ||
SetTextColor(lpdis->hDC, RGB(0,0,255)); // Win95/NT4 arrggg!!! (lpdis->itemAction & ODA_SELECT))
DrawFocusRect(lpdis->hDC, &pFields[nIdx].rect);
SetTextColor(lpdis->hDC, (COLORREF)pFields[nIdx].hImage);
pFields[nIdx].rect = lpdis->rcItem; pFields[nIdx].rect = lpdis->rcItem;
// Calculate needed size of the control // Calculate needed size of the control
@ -773,9 +777,6 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg,
// Add little margin to avoid focus rect over text // Add little margin to avoid focus rect over text
lpdis->rcItem.right += 2; lpdis->rcItem.left += 2; lpdis->rcItem.right += 2; lpdis->rcItem.left += 2;
if ( lpdis->itemState & ODS_HOTLIGHT )
OutputDebugString("Hot");
DrawText(lpdis->hDC, pFields[nIdx].pszText, -1, &lpdis->rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE ); DrawText(lpdis->hDC, pFields[nIdx].pszText, -1, &lpdis->rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE );
#ifdef IO_LINK_UNDERLINED #ifdef IO_LINK_UNDERLINED
DeleteObject(SelectObject(lpdis->hDC, OldFont)); DeleteObject(SelectObject(lpdis->hDC, OldFont));
@ -806,8 +807,6 @@ int WINAPI StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lPar
int StaticField = FindControlIdx(GetDlgCtrlID(hWin)); int StaticField = FindControlIdx(GetDlgCtrlID(hWin));
switch(uMsg) switch(uMsg)
{ {
case WM_ERASEBKGND:
return 0;
case WM_GETDLGCODE: case WM_GETDLGCODE:
return DLGC_BUTTON|DLGC_WANTALLKEYS; return DLGC_BUTTON|DLGC_WANTALLKEYS;
case WM_KEYDOWN: case WM_KEYDOWN:

BIN
Plugins/InstallOptions.dll
View file

Binary file not shown.