Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 08:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- remove SmallDiam for check boxes and radio butttons

Browse source 
- TODO: needs some fixes to adjust the checkmark vertically

svn path=/trunk/; revision=44675
This commit is contained in:
Matthias Kupfer 2009-12-20 18:48:34 +00:00
parent 14b73017ae
commit 85bc5f7dc1
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
reactos/dll/win32/user32/windows/draw.c
View file

@ -701,10 +701,9 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags)
static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL Radio) static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL Radio)
{ {
RECT rc;
LOGFONTW lf; LOGFONTW lf;
HFONT hFont, hOldFont; HFONT hFont, hOldFont;
int SmallDiam, i; int i;
TCHAR OutRight, OutLeft, InRight, InLeft, Center; TCHAR OutRight, OutLeft, InRight, InLeft, Center;
if (Radio) if (Radio)
@ -723,10 +722,8 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL R
Center = 'g'; // center Center = 'g'; // center
} }
SmallDiam = UITOOLS_MakeSquareRect(r, &rc);
ZeroMemory(&lf, sizeof(LOGFONTW)); ZeroMemory(&lf, sizeof(LOGFONTW));
lf.lfHeight = SmallDiam; lf.lfHeight = r->top - r->bottom;
lf.lfWidth = 0; lf.lfWidth = 0;
lf.lfWeight = FW_NORMAL; lf.lfWeight = FW_NORMAL;
lf.lfCharSet = DEFAULT_CHARSET; lf.lfCharSet = DEFAULT_CHARSET;
@ -738,12 +735,12 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL R
{ {
SetBkMode(dc, OPAQUE); SetBkMode(dc, OPAQUE);
SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME));
TextOut(dc, rc.left, rc.top, &Center, 1); TextOut(dc, r->left, r->top, &Center, 1);
SetBkMode(dc, TRANSPARENT); SetBkMode(dc, TRANSPARENT);
SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME));
TextOut(dc, rc.left, rc.top, &OutRight, 1); TextOut(dc, r->left, r->top, &OutRight, 1);
SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME));
TextOut(dc, rc.left, rc.top, &OutLeft, 1); TextOut(dc, r->left, r->top, &OutLeft, 1);
} }
else else
{ {
@ -752,26 +749,26 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL R
/* Center section, white for active, grey for inactive */ /* Center section, white for active, grey for inactive */
i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE;
SetTextColor(dc, GetSysColor(i)); SetTextColor(dc, GetSysColor(i));
TextOut(dc, rc.left, rc.top, &Center, 1); TextOut(dc, r->left, r->top, &Center, 1);
if(uFlags & (DFCS_FLAT | DFCS_MONO)) if(uFlags & (DFCS_FLAT | DFCS_MONO))
{ {
SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME));
TextOut(dc, rc.left, rc.top, &OutRight, 1); TextOut(dc, r->left, r->top, &OutRight, 1);
TextOut(dc, rc.left, rc.top, &OutLeft, 1); TextOut(dc, r->left, r->top, &OutLeft, 1);
TextOut(dc, rc.left, rc.top, &InRight, 1); TextOut(dc, r->left, r->top, &InRight, 1);
TextOut(dc, rc.left, rc.top, &InLeft, 1); TextOut(dc, r->left, r->top, &InLeft, 1);
} }
else else
{ {
SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW));
TextOut(dc, rc.left, rc.top, &OutRight, 1); TextOut(dc, r->left, r->top, &OutRight, 1);
SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT));
TextOut(dc, rc.left, rc.top, &OutLeft, 1); TextOut(dc, r->left, r->top, &OutLeft, 1);
SetTextColor(dc, GetSysColor(COLOR_3DDKSHADOW)); SetTextColor(dc, GetSysColor(COLOR_3DDKSHADOW));
TextOut(dc, rc.left, rc.top, &InRight, 1); TextOut(dc, r->left, r->top, &InRight, 1);
SetTextColor(dc, GetSysColor(COLOR_3DLIGHT)); SetTextColor(dc, GetSysColor(COLOR_3DLIGHT));
TextOut(dc, rc.left, rc.top, &InLeft, 1); TextOut(dc, r->left, r->top, &InLeft, 1);
} }
} }
@ -780,7 +777,7 @@ static BOOL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL R
TCHAR Check = (Radio) ? 'i' : 'b'; TCHAR Check = (Radio) ? 'i' : 'b';
SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT));
TextOut(dc, rc.left, rc.top, &Check, 1); TextOut(dc, r->left, r->top, &Check, 1);
} }
SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT));