Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 20:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lots of bug fixes

Browse source 
svn path=/trunk/; revision=4231
This commit is contained in:
Richard Campbell 2003-03-02 16:30:07 +00:00
parent 0dcf21545b
commit 31ed89a07f
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: draw.c,v 1.7 2003/03/01 08:56:34 rcampbell Exp $ /* $Id: draw.c,v 1.8 2003/03/02 16:30:07 rcampbell Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c * FILE: lib/user32/windows/input.c
@ -500,7 +500,11 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
if(LTOuterI != -1) LTOuterPen = GetSysColorPen(LTOuterI); if(LTOuterI != -1) LTOuterPen = GetSysColorPen(LTOuterI);
if(RBInnerI != -1) RBInnerPen = GetSysColorPen(RBInnerI); if(RBInnerI != -1) RBInnerPen = GetSysColorPen(RBInnerI);
if(RBOuterI != -1) RBOuterPen = GetSysColorPen(RBOuterI); if(RBOuterI != -1) RBOuterPen = GetSysColorPen(RBOuterI);
if((uFlags & BF_MIDDLE) && retval)
{
FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ?
COLOR_WINDOW : COLOR_BTNFACE));
}
MoveToEx(hdc, 0, 0, &SavePoint); MoveToEx(hdc, 0, 0, &SavePoint);
/* Draw the outer edge */ /* Draw the outer edge */
@ -518,13 +522,13 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
SelectObject(hdc, RBOuterPen); SelectObject(hdc, RBOuterPen);
if(uFlags & BF_BOTTOM) if(uFlags & BF_BOTTOM)
{ {
MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL); MoveToEx(hdc, InnerRect.right, InnerRect.bottom-1, NULL);
LineTo(hdc, InnerRect.left-1, InnerRect.bottom-1); LineTo(hdc, InnerRect.left, InnerRect.bottom-1);
} }
if(uFlags & BF_RIGHT) if(uFlags & BF_RIGHT)
{ {
MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL); MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom, NULL);
LineTo(hdc, InnerRect.right-1, InnerRect.top-1); LineTo(hdc, InnerRect.right-1, InnerRect.top);
} }
/* Draw the inner edge */ /* Draw the inner edge */
@ -542,13 +546,13 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
SelectObject(hdc, RBInnerPen); SelectObject(hdc, RBInnerPen);
if(uFlags & BF_BOTTOM) if(uFlags & BF_BOTTOM)
{ {
MoveToEx(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2, NULL); MoveToEx(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2, NULL);
LineTo(hdc, InnerRect.left-1+LBpenplus, InnerRect.bottom-2); LineTo(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2);
} }
if(uFlags & BF_RIGHT) if(uFlags & BF_RIGHT)
{ {
MoveToEx(hdc, InnerRect.right-2, InnerRect.bottom-1-RBpenplus, NULL); MoveToEx(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus, NULL);
LineTo(hdc, InnerRect.right-2, InnerRect.top-1+RTpenplus); LineTo(hdc, InnerRect.right-2, InnerRect.top+RTpenplus);
} }
if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) ) if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) )
@ -561,12 +565,6 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
if(uFlags & BF_TOP) InnerRect.top += add; if(uFlags & BF_TOP) InnerRect.top += add;
if(uFlags & BF_BOTTOM) InnerRect.bottom -= add; if(uFlags & BF_BOTTOM) InnerRect.bottom -= add;
if((uFlags & BF_MIDDLE) && retval)
{
FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ?
COLOR_WINDOW : COLOR_BTNFACE));
}
if(uFlags & BF_ADJUST) if(uFlags & BF_ADJUST)
*rc = InnerRect; *rc = InnerRect;
} }
@ -950,8 +948,8 @@ static BOOL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags)
MoveToEx(dc, start.x + i, start.y, &oldPos); MoveToEx(dc, start.x + i, start.y, &oldPos);
LineTo(dc, start.x + i + width, start.y + height); LineTo(dc, start.x + i + width, start.y + height);
MoveToEx(dc, start.x + i, start.y + height - 1, &oldPos); MoveToEx(dc, start.x + i, start.y + height, &oldPos);
LineTo(dc, start.x + i + width, start.y - 1); LineTo(dc, start.x + i + width, start.y);
} }
SelectObject(dc, hpsave); SelectObject(dc, hpsave);