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

comctl32/monthcal: Respect locale abbreviated day names when calculating control dimensions.

This commit is contained in:
Nikolay Sivov 2009-09-30 02:15:40 +04:00 committed by Alexandre Julliard
parent ad40c15ccc
commit 52570539d8
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/comctl32/monthcal.c
View File

@ -1739,7 +1739,6 @@ MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr)
/* sets the size information */
static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr)
{
static const WCHAR SunW[] = { 'S','u','n',0 };
static const WCHAR O0W[] = { '0','0',0 };
HDC hdc = GetDC(infoPtr->hwndSelf);
RECT *title=&infoPtr->title;
@ -1751,11 +1750,12 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr)
RECT *weeknumrect=&infoPtr->weeknums;
RECT *days=&infoPtr->days;
RECT *todayrect=&infoPtr->todayrect;
SIZE size;
SIZE size, sz;
TEXTMETRICW tm;
HFONT currentFont;
INT xdiv, dx, dy;
INT xdiv, dx, dy, i;
RECT rcClient;
WCHAR buff[80];
GetClientRect(infoPtr->hwndSelf, &rcClient);
@ -1764,7 +1764,26 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr)
/* get the height and width of each day's text */
GetTextMetricsW(hdc, &tm);
infoPtr->textHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading;
GetTextExtentPoint32W(hdc, SunW, 3, &size);
/* find largest abbreviated day name for current locale */
size.cx = sz.cx = 0;
for (i = 0; i < 7; i++)
{
if(GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1,
buff, countof(buff)))
{
GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz);
if (sz.cx > size.cx) size.cx = sz.cx;
}
else /* locale independent fallback on failure */
{
static const WCHAR SunW[] = { 'S','u','n',0 };
GetTextExtentPoint32W(hdc, SunW, lstrlenW(SunW), &size);
break;
}
}
infoPtr->textWidth = size.cx + 2;
/* recalculate the height and width increments and offsets */