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

gdi32: Add support for PS_INSIDEFRAME pens when drawing rectangles.

This commit is contained in:
Alexandre Julliard 2011-12-28 11:06:30 +01:00
parent c861284a02
commit 18c20964e1
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/gdi32/dibdrv/dibdrv.h
View File

@ -83,7 +83,7 @@ typedef struct dibdrv_physdev
/* pen */ /* pen */
COLORREF pen_colorref; COLORREF pen_colorref;
DWORD pen_endcap, pen_join; DWORD pen_style, pen_endcap, pen_join;
int pen_width; int pen_width;
dash_pattern pen_pattern; dash_pattern pen_pattern;
dash_pos dash_pos; dash_pos dash_pos;

8
dlls/gdi32/dibdrv/graphics.c
View File

@ -580,6 +580,14 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
if(defer_pen(pdev)) if(defer_pen(pdev))
return next->funcs->pRectangle( next, left, top, right, bottom ); return next->funcs->pRectangle( next, left, top, right, bottom );
if (pdev->pen_style == PS_INSIDEFRAME)
{
rect.left += pdev->pen_width / 2;
rect.top += pdev->pen_width / 2;
rect.right -= (pdev->pen_width - 1) / 2;
rect.bottom -= (pdev->pen_width - 1) / 2;
}
reset_dash_origin(pdev); reset_dash_origin(pdev);
/* 4 pts going anti-clockwise starting from top-right */ /* 4 pts going anti-clockwise starting from top-right */

8
dlls/gdi32/dibdrv/objects.c
View File

@ -1279,7 +1279,6 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen );
dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
LOGPEN logpen; LOGPEN logpen;
DWORD style;
TRACE("(%p, %p)\n", dev, hpen); TRACE("(%p, %p)\n", dev, hpen);
@ -1315,11 +1314,12 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
pdev->defer |= DEFER_PEN; pdev->defer |= DEFER_PEN;
style = logpen.lopnStyle & PS_STYLE_MASK; pdev->pen_style = logpen.lopnStyle & PS_STYLE_MASK;
switch(style) switch (pdev->pen_style)
{ {
case PS_SOLID: case PS_SOLID:
case PS_INSIDEFRAME:
if(pdev->pen_width <= 1) if(pdev->pen_width <= 1)
pdev->pen_lines = solid_pen_lines; pdev->pen_lines = solid_pen_lines;
else else
@ -1334,7 +1334,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnStyle & PS_GEOMETRIC) break;
if(logpen.lopnWidth.x > 1) break; if(logpen.lopnWidth.x > 1) break;
pdev->pen_lines = dashed_pen_lines; pdev->pen_lines = dashed_pen_lines;
pdev->pen_pattern = dash_patterns[style]; pdev->pen_pattern = dash_patterns[pdev->pen_style];
pdev->defer &= ~DEFER_PEN; pdev->defer &= ~DEFER_PEN;
break; break;