Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Implemented handling for DC_INBUTTON and DC_SMALLCAP styles in DrawCaption()

Browse source 
* Misc. other very minor improvements

svn path=/trunk/; revision=5690
This commit is contained in:
Andrew Greenwood 2003-08-20 01:41:01 +00:00
parent de05ce363a
commit 675c971445
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/lib/user32/windows/defwnd.c
View file

@ -1,4 +1,4 @@
/* $Id: defwnd.c,v 1.70 2003/08/20 00:41:04 silverblade Exp $ /* $Id: defwnd.c,v 1.71 2003/08/20 01:41:01 silverblade Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -446,7 +446,7 @@ DrawCaption(
if (! OldBMP) goto cleanup; if (! OldBMP) goto cleanup;
#else #else
MemDC = hDC; MemDC = hDC;
OffsetViewportOrgEx(MemDC, lprc->left, lprc->top, NULL); OffsetViewportOrgEx(MemDC, lprc->left, lprc->top, NULL);
#endif #endif
@ -454,9 +454,19 @@ DrawCaption(
// be painted. For now, that flag is ignored. // be painted. For now, that flag is ignored.
// Draw the caption background // Draw the caption background
OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) ); if (uFlags & DC_INBUTTON)
if (! OldBrush) goto cleanup; {
PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY ); OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_BTNFACE : COLOR_BTNSHADOW) );
if (! OldBrush) goto cleanup;
if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup;
}
else
{
// DC_GRADIENT check should go here somewhere
OldBrush = SelectObject(MemDC, GetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) );
if (! OldBrush) goto cleanup;
if (! PatBlt(MemDC, 0, 0, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY )) goto cleanup;
}
VCenter = (lprc->bottom - lprc->top) / 2; VCenter = (lprc->bottom - lprc->top) / 2;
Padding = VCenter - (GetSystemMetrics(SM_CYCAPTION) / 2); Padding = VCenter - (GetSystemMetrics(SM_CYCAPTION) / 2);
@ -480,13 +490,19 @@ DrawCaption(
if ((uFlags & DC_TEXT) && (GetWindowTextW( hWnd, buffer, sizeof(buffer)/sizeof(buffer[0]) ))) if ((uFlags & DC_TEXT) && (GetWindowTextW( hWnd, buffer, sizeof(buffer)/sizeof(buffer[0]) )))
{ {
r.left += GetSystemMetrics(SM_CXSIZE) + Padding; r.left += GetSystemMetrics(SM_CXSIZE) + Padding;
r.right = (lprc->right - lprc->left) - r.left; r.right = (lprc->right - lprc->left);
nclm.cbSize = sizeof(nclm); nclm.cbSize = sizeof(nclm);
if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &nclm, 0)) goto cleanup; if (! SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &nclm, 0)) goto cleanup;
SetTextColor(MemDC, SysColours[ uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT]);
if (uFlags & DC_INBUTTON)
SetTextColor(MemDC, SysColours[ uFlags & DC_ACTIVE ? COLOR_BTNTEXT : COLOR_GRAYTEXT]);
else
SetTextColor(MemDC, SysColours[ uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT]);
SetBkMode( MemDC, TRANSPARENT ); SetBkMode( MemDC, TRANSPARENT );
if (GetWindowLongW(hWnd, GWL_STYLE) & WS_EX_TOOLWINDOW) // if (GetWindowLongW(hWnd, GWL_STYLE) & WS_EX_TOOLWINDOW)
if (uFlags & DC_SMALLCAP)
hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont); hFont = CreateFontIndirectW(&nclm.lfSmCaptionFont);
else else
hFont = CreateFontIndirectW(&nclm.lfCaptionFont); hFont = CreateFontIndirectW(&nclm.lfCaptionFont);
@ -550,7 +566,10 @@ UserDrawCaptionNC (
UINT capflags = 0; UINT capflags = 0;
capflags = DC_ICON | DC_TEXT; capflags = DC_ICON | DC_TEXT;
capflags += active & DC_ACTIVE; capflags |= (active & DC_ACTIVE);
if (GetWindowLongW(hWnd, GWL_STYLE) & WS_EX_TOOLWINDOW)
capflags |= DC_SMALLCAP;
// Old code: // Old code:
// PatBlt(hDC,rect->left + GetSystemMetrics(SM_CXFRAME), rect->top + // PatBlt(hDC,rect->left + GetSystemMetrics(SM_CXFRAME), rect->top +