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

comctl32/datetime: Fix selections painting - use text rectangle, not whole field.

This commit is contained in:
Nikolay Sivov 2009-10-09 00:38:38 +04:00 committed by Alexandre Julliard
parent 26ab381ffa
commit c93a520783
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/comctl32/datetime.c
View File

@ -632,19 +632,15 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO
static void static void
DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
{ {
int i,prevright;
RECT *field;
RECT *rcDraw = &infoPtr->rcDraw;
RECT *calbutton = &infoPtr->calbutton;
RECT *checkbox = &infoPtr->checkbox;
SIZE size;
COLORREF oldTextColor;
SHORT fieldWidth = 0;
/* draw control edge */
TRACE("\n"); TRACE("\n");
if (infoPtr->dateValid) { if (infoPtr->dateValid) {
int i, prevright;
RECT *field;
RECT *rcDraw = &infoPtr->rcDraw;
SIZE size;
COLORREF oldTextColor;
SHORT fieldWidth = 0;
HFONT oldFont = SelectObject (hdc, infoPtr->hFont); HFONT oldFont = SelectObject (hdc, infoPtr->hFont);
INT oldBkMode = SetBkMode (hdc, TRANSPARENT); INT oldBkMode = SetBkMode (hdc, TRANSPARENT);
WCHAR txt[80]; WCHAR txt[80];
@ -653,25 +649,35 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size); GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size);
rcDraw->bottom = size.cy + 2; rcDraw->bottom = size.cy + 2;
prevright = checkbox->right = ((infoPtr->dwStyle & DTS_SHOWNONE) ? 18 : 2); prevright = infoPtr->checkbox.right = ((infoPtr->dwStyle & DTS_SHOWNONE) ? 18 : 2);
for (i = 0; i < infoPtr->nrFields; i++) { for (i = 0; i < infoPtr->nrFields; i++) {
DATETIME_ReturnTxt (infoPtr, i, txt, sizeof(txt)/sizeof(txt[0])); DATETIME_ReturnTxt (infoPtr, i, txt, sizeof(txt)/sizeof(txt[0]));
GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size); GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size);
DATETIME_ReturnFieldWidth (infoPtr, hdc, i, &fieldWidth); DATETIME_ReturnFieldWidth (infoPtr, hdc, i, &fieldWidth);
field = &infoPtr->fieldRect[i]; field = &infoPtr->fieldRect[i];
field->left = prevright; field->left = prevright;
field->right = prevright + fieldWidth; field->right = prevright + fieldWidth;
field->top = rcDraw->top; field->top = rcDraw->top;
field->bottom = rcDraw->bottom; field->bottom = rcDraw->bottom;
prevright = field->right; prevright = field->right;
if (infoPtr->dwStyle & WS_DISABLED) if (infoPtr->dwStyle & WS_DISABLED)
oldTextColor = SetTextColor (hdc, comctl32_color.clrGrayText); oldTextColor = SetTextColor (hdc, comctl32_color.clrGrayText);
else if ((infoPtr->haveFocus) && (i == infoPtr->select)) { else if ((infoPtr->haveFocus) && (i == infoPtr->select)) {
RECT selection;
/* fill if focused */ /* fill if focused */
HBRUSH hbr = CreateSolidBrush (comctl32_color.clrActiveCaption); HBRUSH hbr = CreateSolidBrush (comctl32_color.clrActiveCaption);
FillRect(hdc, field, hbr);
selection.right = field->right;
selection.left = selection.right - size.cx;
selection.top = 0;
selection.bottom = size.cy;
/* center rectangle */
OffsetRect(&selection, 0, (field->bottom - size.cy)/2);
FillRect(hdc, &selection, hbr);
DeleteObject (hbr); DeleteObject (hbr);
oldTextColor = SetTextColor (hdc, comctl32_color.clrWindow); oldTextColor = SetTextColor (hdc, comctl32_color.clrWindow);
} }
@ -687,7 +693,7 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
} }
if (!(infoPtr->dwStyle & DTS_UPDOWN)) { if (!(infoPtr->dwStyle & DTS_UPDOWN)) {
DrawFrameControl(hdc, calbutton, DFC_SCROLL, DrawFrameControl(hdc, &infoPtr->calbutton, DFC_SCROLL,
DFCS_SCROLLDOWN | (infoPtr->bCalDepressed ? DFCS_PUSHED : 0) | DFCS_SCROLLDOWN | (infoPtr->bCalDepressed ? DFCS_PUSHED : 0) |
(infoPtr->dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) ); (infoPtr->dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
} }