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

comctl32: Properly paint thumb using DrawEdge() for diagonal edges too.

This commit is contained in:
Nikolay Sivov 2013-05-12 17:12:32 +04:00 committed by Alexandre Julliard
parent a24808326d
commit 1776cbf459
1 changed files with 158 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
dlls/comctl32/trackbar.c
View File

@ -612,10 +612,103 @@ TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc)
} }
} }
static int
TRACKBAR_FillThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, HBRUSH hbrush)
{
const RECT *thumb = &infoPtr->rcThumb;
const int PointCount = 6;
POINT points[PointCount];
int PointDepth;
HBRUSH oldbr;
if (infoPtr->dwStyle & TBS_BOTH)
{
FillRect(hdc, thumb, hbrush);
return 0;
}
if (infoPtr->dwStyle & TBS_VERT)
{
PointDepth = (thumb->bottom - thumb->top) / 2;
if (infoPtr->dwStyle & TBS_LEFT)
{
points[0].x = thumb->right-1;
points[0].y = thumb->top;
points[1].x = thumb->right-1;
points[1].y = thumb->bottom-1;
points[2].x = thumb->left + PointDepth;
points[2].y = thumb->bottom-1;
points[3].x = thumb->left;
points[3].y = thumb->top + PointDepth;
points[4].x = thumb->left + PointDepth;
points[4].y = thumb->top;
points[5].x = points[0].x;
points[5].y = points[0].y;
}
else
{
points[0].x = thumb->right;
points[0].y = thumb->top + PointDepth;
points[1].x = thumb->right - PointDepth;
points[1].y = thumb->bottom-1;
points[2].x = thumb->left;
points[2].y = thumb->bottom-1;
points[3].x = thumb->left;
points[3].y = thumb->top;
points[4].x = thumb->right - PointDepth;
points[4].y = thumb->top;
points[5].x = points[0].x;
points[5].y = points[0].y;
}
}
else
{
PointDepth = (thumb->right - thumb->left) / 2;
if (infoPtr->dwStyle & TBS_TOP)
{
points[0].x = thumb->left + PointDepth;
points[0].y = thumb->top+1;
points[1].x = thumb->right-1;
points[1].y = thumb->top + PointDepth + 1;
points[2].x = thumb->right-1;
points[2].y = thumb->bottom-1;
points[3].x = thumb->left;
points[3].y = thumb->bottom-1;
points[4].x = thumb->left;
points[4].y = thumb->top + PointDepth + 1;
points[5].x = points[0].x;
points[5].y = points[0].y;
}
else
{
points[0].x = thumb->right-1;
points[0].y = thumb->top;
points[1].x = thumb->right-1;
points[1].y = thumb->bottom - PointDepth - 1;
points[2].x = thumb->left + PointDepth;
points[2].y = thumb->bottom-1;
points[3].x = thumb->left;
points[3].y = thumb->bottom - PointDepth - 1;
points[4].x = thumb->left;
points[4].y = thumb->top;
points[5].x = points[0].x;
points[5].y = points[0].y;
}
}
oldbr = SelectObject(hdc, hbrush);
SetPolyFillMode(hdc, WINDING);
Polygon(hdc, points, PointCount);
SelectObject(hdc, oldbr);
return PointDepth;
}
static void static void
TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc) TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc)
{ {
HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); HTHEME theme = GetWindowTheme (infoPtr->hwndSelf);
int PointDepth;
HBRUSH brush; HBRUSH brush;
if (theme) if (theme)
@ -643,7 +736,7 @@ TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc)
return; return;
} }
if (infoPtr->dwStyle & WS_DISABLED) if (infoPtr->dwStyle & WS_DISABLED || infoPtr->flags & TB_DRAG_MODE)
{ {
if (comctl32_color.clr3dHilight == comctl32_color.clrWindow) if (comctl32_color.clr3dHilight == comctl32_color.clrWindow)
brush = COMCTL32_hPattern55AABrush; brush = COMCTL32_hPattern55AABrush;
@ -654,105 +747,98 @@ TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc)
SetBkColor(hdc, comctl32_color.clr3dHilight); SetBkColor(hdc, comctl32_color.clr3dHilight);
} }
else else
brush = GetSysColorBrush(infoPtr->flags & TB_DRAG_MODE ? COLOR_BTNHILIGHT : COLOR_BTNFACE); brush = GetSysColorBrush(COLOR_BTNFACE);
PointDepth = TRACKBAR_FillThumb(infoPtr, hdc, brush);
if (infoPtr->dwStyle & TBS_BOTH) if (infoPtr->dwStyle & TBS_BOTH)
{ {
FillRect(hdc, &infoPtr->rcThumb, brush);
DrawEdge(hdc, &infoPtr->rcThumb, EDGE_RAISED, BF_RECT | BF_SOFT); DrawEdge(hdc, &infoPtr->rcThumb, EDGE_RAISED, BF_RECT | BF_SOFT);
return; return;
} }
else else
{ {
HBRUSH oldbr = SelectObject(hdc, brush);
RECT thumb = infoPtr->rcThumb; RECT thumb = infoPtr->rcThumb;
int BlackUntil = 3;
int PointCount = 6;
POINT points[6];
int PointDepth;
HPEN oldpen;
SetPolyFillMode (hdc, WINDING);
if (infoPtr->dwStyle & TBS_VERT) if (infoPtr->dwStyle & TBS_VERT)
{ {
PointDepth = (thumb.bottom - thumb.top) / 2;
if (infoPtr->dwStyle & TBS_LEFT) if (infoPtr->dwStyle & TBS_LEFT)
{ {
points[0].x=thumb.right; /* rectangular part */
points[0].y=thumb.top; thumb.left += PointDepth;
points[1].x=thumb.right; DrawEdge(hdc, &thumb, EDGE_RAISED, BF_TOP | BF_RIGHT | BF_BOTTOM | BF_SOFT);
points[1].y=thumb.bottom;
points[2].x=thumb.left + PointDepth; /* light edge */
points[2].y=thumb.bottom; thumb.left -= PointDepth;
points[3].x=thumb.left; thumb.right = thumb.left + PointDepth;
points[3].y=(thumb.bottom - thumb.top) / 2 + thumb.top + 1; thumb.bottom = infoPtr->rcThumb.top + PointDepth + 1;
points[4].x=thumb.left + PointDepth; thumb.top = infoPtr->rcThumb.top;
points[4].y=thumb.top; DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPRIGHT | BF_SOFT);
points[5].x=points[0].x;
points[5].y=points[0].y; /* shadowed edge */
BlackUntil = 4; thumb.top += PointDepth;
thumb.bottom += PointDepth;
DrawEdge(hdc, &thumb, EDGE_SUNKEN, BF_DIAGONAL_ENDTOPLEFT | BF_SOFT);
return;
} }
else else
{ {
points[0].x=thumb.right; /* rectangular part */
points[0].y=(thumb.bottom - thumb.top) / 2 + thumb.top + 1; thumb.right -= PointDepth;
points[1].x=thumb.right - PointDepth; DrawEdge(hdc, &thumb, EDGE_RAISED, BF_TOP | BF_LEFT | BF_BOTTOM | BF_SOFT);
points[1].y=thumb.bottom;
points[2].x=thumb.left; /* light edge */
points[2].y=thumb.bottom; thumb.left = thumb.right;
points[3].x=thumb.left; thumb.right += PointDepth + 1;
points[3].y=thumb.top; thumb.bottom = infoPtr->rcThumb.top + PointDepth + 1;
points[4].x=thumb.right - PointDepth; thumb.top = infoPtr->rcThumb.top;
points[4].y=thumb.top; DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPLEFT | BF_SOFT);
points[5].x=points[0].x;
points[5].y=points[0].y; /* shadowed edge */
thumb.top += PointDepth;
thumb.bottom += PointDepth;
DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDBOTTOMLEFT | BF_SOFT);
} }
} }
else else
{ {
PointDepth = (thumb.right - thumb.left) / 2;
if (infoPtr->dwStyle & TBS_TOP) if (infoPtr->dwStyle & TBS_TOP)
{ {
points[0].x=(thumb.right - thumb.left) / 2 + thumb.left + 1; /* rectangular part */
points[0].y=thumb.top; thumb.top += PointDepth;
points[1].x=thumb.right; DrawEdge(hdc, &thumb, EDGE_RAISED, BF_LEFT | BF_BOTTOM | BF_RIGHT | BF_SOFT);
points[1].y=thumb.top + PointDepth;
points[2].x=thumb.right; /* light edge */
points[2].y=thumb.bottom; thumb.left = infoPtr->rcThumb.left;
points[3].x=thumb.left; thumb.right = thumb.left + PointDepth;
points[3].y=thumb.bottom; thumb.bottom = infoPtr->rcThumb.top + PointDepth + 1;
points[4].x=thumb.left; thumb.top -= PointDepth;
points[4].y=thumb.top + PointDepth; DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPRIGHT | BF_SOFT);
points[5].x=points[0].x;
points[5].y=points[0].y; /* shadowed edge */
BlackUntil = 4; thumb.left += PointDepth;
thumb.right += PointDepth;
DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDBOTTOMRIGHT | BF_SOFT);
} }
else else
{ {
points[0].x=thumb.right; /* rectangular part */
points[0].y=thumb.top; thumb.bottom -= PointDepth;
points[1].x=thumb.right; DrawEdge(hdc, &thumb, EDGE_RAISED, BF_LEFT | BF_TOP | BF_RIGHT | BF_SOFT);
points[1].y=thumb.bottom - PointDepth;
points[2].x=(thumb.right - thumb.left) / 2 + thumb.left + 1;
points[2].y=thumb.bottom;
points[3].x=thumb.left;
points[3].y=thumb.bottom - PointDepth;
points[4].x=thumb.left;
points[4].y=thumb.top;
points[5].x=points[0].x;
points[5].y=points[0].y;
}
}
/* Draw the thumb now */ /* light edge */
Polygon (hdc, points, PointCount); thumb.left = infoPtr->rcThumb.left;
oldpen = SelectObject(hdc, GetStockObject(BLACK_PEN)); thumb.right = thumb.left + PointDepth;
Polyline(hdc,points, BlackUntil); thumb.top = infoPtr->rcThumb.bottom - PointDepth - 1;
SelectObject(hdc, GetStockObject(WHITE_PEN)); thumb.bottom += PointDepth;
Polyline(hdc, &points[BlackUntil-1], PointCount+1-BlackUntil); DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPLEFT | BF_SOFT);
SelectObject(hdc, oldpen);
SelectObject(hdc, oldbr); /* shadowed edge */
thumb.left += PointDepth;
thumb.right += PointDepth;
DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDBOTTOMLEFT | BF_SOFT);
}
}
} }
} }