ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Modernize the look of the colour boxes in the colour dialog.

This commit is contained in:
Divan Burger 2008-01-07 19:46:54 +02:00 committed by Alexandre Julliard
parent 3a508e605b
commit ad92cdcf55
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/comdlg32/colordlg.c
View File

@ -739,7 +739,7 @@ void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect )
static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
{
HWND hwnd = GetDlgItem(hDlg, 0x2d0);
RECT rect;
RECT rect, blockrect;
HDC hdc;
HBRUSH hBrush;
int dx, dy, i, j, k;
@ -762,14 +762,17 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
hBrush = CreateSolidBrush(predefcolors[j][i]);
if (hBrush)
{
hBrush = SelectObject(hdc, hBrush);
Rectangle(hdc, rect.left, rect.top,
rect.left + dx - DISTANCE, rect.top + dy - DISTANCE);
rect.left = rect.left + dx;
DeleteObject(SelectObject(hdc, hBrush)) ;
blockrect.left = rect.left;
blockrect.top = rect.top;
blockrect.right = rect.left + dx - DISTANCE;
blockrect.bottom = rect.top + dy - DISTANCE;
FillRect(hdc, &blockrect, hBrush);
DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT);
DeleteObject(hBrush);
}
rect.left += dx;
}
rect.top = rect.top + dy;
rect.top += dy;
rect.left = k;
}
ReleaseDC(hwnd, hdc);
@ -783,7 +786,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr )
{
HWND hwnd = GetDlgItem(hDlg, 0x2d1);
RECT rect;
RECT rect, blockrect;
HDC hdc;
HBRUSH hBrush;
int dx, dy, i, j, k;
@ -808,14 +811,17 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr
hBrush = CreateSolidBrush(lpcr[i+j*cols]);
if (hBrush)
{
hBrush = SelectObject(hdc, hBrush) ;
Rectangle(hdc, rect.left, rect.top,
rect.left + dx - DISTANCE, rect.top + dy - DISTANCE);
rect.left = rect.left + dx;
DeleteObject( SelectObject(hdc, hBrush) ) ;
blockrect.left = rect.left;
blockrect.top = rect.top;
blockrect.right = rect.left + dx - DISTANCE;
blockrect.bottom = rect.top + dy - DISTANCE;
FillRect(hdc, &blockrect, hBrush);
DrawEdge(hdc, &blockrect, BDR_SUNKEN, BF_RECT);
DeleteObject(hBrush);
}
rect.left += dx;
}
rect.top = rect.top + dy;
rect.top += dy;
rect.left = k;
}
ReleaseDC(hwnd, hdc);
@ -825,7 +831,6 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr
}
/***********************************************************************
* CC_HookCallChk [internal]
*/