Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Now uses DrawFrameControl to draw controls, still MANY bugs but I'm slowly getting there.

Browse source 
svn path=/trunk/; revision=4221
This commit is contained in:
Richard Campbell 2003-03-01 08:56:34 +00:00
parent 424f2d1c24
commit c8274bd166
2 changed files with 66 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $Id: defwnd.c,v 1.22 2003/02/28 23:20:41 rcampbell Exp $
/* $Id: defwnd.c,v 1.23 2003/03/01 08:56:34 rcampbell Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
@ -219,54 +219,73 @@ void UserDrawSysMenuButton( HWND hWnd, HDC hDC, BOOL down )
static void UserDrawCloseButton ( HWND hWnd, HDC hDC, BOOL down )
{
/* ported from wine code */
RECT rect;
HDC hDCMem;
BOOL bInactive = FALSE;
UserGetInsideRectNC( hWnd, &rect );
hDCMem = CreateCompatibleDC( hDC );
SelectObject( hDCMem, (hbitmapClose) );
BitBlt( hDC,rect.right - GetSystemMetrics(SM_CXSMSIZE), rect.top + 1,
GetSystemMetrics(SM_CXSMSIZE) + 1, GetSystemMetrics(SM_CYSMSIZE),
hDCMem,0,0,SRCCOPY );
DeleteDC( hDCMem );
if (GetWindowLongA( hWnd, GWL_EXSTYLE ) & WS_EX_TOOLWINDOW)
{
INT iBmpHeight = 11; /* Windows does not use SM_CXSMSIZE and SM_CYSMSIZE */
INT iBmpWidth = 11; /* it uses 11x11 for the close button in tool window */
INT iCaptionHeight = GetSystemMetrics(SM_CYSMCAPTION);
rect.top = rect.top + (iCaptionHeight - 1 - iBmpHeight) / 2;
rect.left = rect.right - (iCaptionHeight + 1 + iBmpWidth) / 2;
rect.bottom = rect.top + iBmpHeight;
rect.right = rect.left + iBmpWidth;
}
else
{
rect.top++;
rect.right--;
/* Standard close/min/max button sizes appear to be 16x14, though
these change with the caption size, I'll fix this soon */
rect.left = rect.right - 16;
rect.bottom = rect.top + 14;
}
DrawFrameControl( hDC, &rect, DFC_CAPTION,
(DFCS_CAPTIONCLOSE |
(down ? DFCS_PUSHED : 0) |
(bInactive ? DFCS_INACTIVE : 0)) );
}
static void UserDrawMaxButton( HWND hWnd, HDC hDC, BOOL down )
{
{
RECT rect;
HDC hDCMem;
UINT flags = IsZoomed(hWnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX;
UserGetInsideRectNC( hWnd, &rect );
hDCMem = CreateCompatibleDC( hDC );
SelectObject( hDCMem, (IsZoomed(hWnd)
? (down ? hbitmapRestoreD : hbitmapRestore)
: (down ? hbitmapMaximizeD : hbitmapMaximize)) );
BitBlt( hDC, rect.right - (GetSystemMetrics(SM_CXSMSIZE) * 2) - 3, rect.top + 1,
GetSystemMetrics(SM_CXSMSIZE) + 1, GetSystemMetrics(SM_CYSMSIZE), hDCMem, 0, 0,
SRCCOPY );
DeleteDC( hDCMem );
rect.top++;
rect.right--;
rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 1) * 2;
rect.right = rect.left + (GetSystemMetrics(SM_CXSIZE) - 2);
rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 4;
if (down) flags |= DFCS_PUSHED;
DrawFrameControl( hDC, &rect, DFC_CAPTION, flags );
}
static void UserDrawMinButton( HWND hWnd, HDC hDC, BOOL down)
{
RECT rect;
HDC hDCMem;
UserGetInsideRectNC(hWnd, &rect);
hDCMem = CreateCompatibleDC(hDC);
SelectObject(hDCMem, (down ? hbitmapMinimizeD : hbitmapMinimize));
if (GetWindowLong(hWnd, GWL_STYLE) & WS_MAXIMIZEBOX)
{
rect.right -= GetSystemMetrics(SM_CXSMSIZE)+1;
}
BitBlt( hDC, rect.right - ( GetSystemMetrics(SM_CXSMSIZE) * 2 ) - 3, rect.top + 1,
GetSystemMetrics(SM_CXSMSIZE) + 1, GetSystemMetrics(SM_CYSMSIZE),
hDCMem, 0, 0,
SRCCOPY );
DeleteDC( hDCMem );
RECT rect;
UINT flags = DFCS_CAPTIONMIN;
BOOL bInactive = FALSE;
UserGetInsideRectNC( hWnd, &rect );
rect.top++;
rect.right--;
rect.left = rect.right - (GetSystemMetrics(SM_CXSIZE) - 2) * 3;
rect.right = rect.left + (GetSystemMetrics(SM_CXSIZE) - 2);
rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZE) - 4;
if (down) flags |= DFCS_PUSHED;
if (bInactive) flags |= DFCS_INACTIVE;
DrawFrameControl( hDC, &rect, DFC_CAPTION, flags );
}
static void UserDrawCaptionNC( HDC hDC, RECT *rect, HWND hWnd,
@ -294,7 +313,7 @@ static void UserDrawCaptionNC( HDC hDC, RECT *rect, HWND hWnd,
/* Fill the caption with COLOR_(IN)ACTIVECAPTION.
In the future this will be GradientFill() */
SelectObject( hDC, GetSysColorBrush(active ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) );
SelectObject( hDC, GetSysColorBrush(active ? COLOR_ACTIVECAPTION : COLOR_ACTIVECAPTION) );
PatBlt(hDC,rect->left + 3, rect->top + 3, rect->right - 6, rect->bottom - 1, PATCOPY );
if (style & WS_SYSMENU)
@ -377,7 +396,6 @@ DefWndDoPaintNC(HWND hWnd, HRGN clip)
if (UserHasAnyFrameStyle(Style, ExStyle))
{
SelectObject(hDC, GetStockObject(NULL_BRUSH));
//Rectangle(hDC, 0, 0, rect.right, rect.bottom);
InflateRect(&rect, -1, -1);
}

20
reactos/lib/user32/windows/draw.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: draw.c,v 1.6 2003/03/01 06:05:36 rcampbell Exp $
/* $Id: draw.c,v 1.7 2003/03/01 08:56:34 rcampbell Exp $
*
* PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c
@ -473,8 +473,8 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
* otherwise.
* Dennis Björklund, 10 June, 99
*/
/* if( TWEAK_WineLook == WIN98_LOOK && LTInnerI != -1 )
LTInnerI = RBInnerI = COLOR_BTNFACE; */
/* if( TWEAK_WineLook == WIN98_LOOK && LTInnerI != -1 ) */
LTInnerI = RBInnerI = COLOR_BTNFACE;
}
else if(uFlags & BF_SOFT)
{
@ -894,7 +894,13 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
COLORREF clrsave;
SIZE size;
UITOOLS95_DFC_ButtonPush(dc, r, uFlags & 0xff00);
//UITOOLS95_DFC_ButtonPush(dc, r, uFlags & 0xff00);
if(uFlags & DFCS_PUSHED)
UITOOLS95_DrawRectEdge(dc,r,BDR_SUNKENINNER | BDR_SUNKENOUTER, BF_RECT |
BF_SOFT | BF_MIDDLE);
else
UITOOLS95_DrawRectEdge(dc,r,BDR_RAISEDINNER | BDR_RAISEDOUTER, BF_RECT |
BF_SOFT | BF_MIDDLE);
switch(uFlags & 0xff)
{
@ -937,7 +943,6 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
start.y++;
}
/* now use the width of each line */
width -= numLines - 1;
for (i = 0; i < numLines; i++)
@ -950,6 +955,7 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
}
SelectObject(dc, hpsave);
return TRUE;
}
@ -1041,10 +1047,8 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
return FALSE;
}
/* Here the drawing takes place */
if(uFlags & DFCS_INACTIVE)
{
/* If we have an inactive button, then you see a shadow */
hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_BTNHIGHLIGHT));
Polygon(dc, Line1, Line1N);
@ -1054,7 +1058,6 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
SelectObject(dc, hbsave);
}
/* Correct for the shadow shift */
if (!(uFlags & DFCS_PUSHED))
{
for(i = 0; i < Line1N; i++)
@ -1069,7 +1072,6 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
}
}
/* Make the final picture */
hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(colorIdx));
hpsave = (HPEN)SelectObject(dc, GetSysColorPen(colorIdx));