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

comctl32/monthcal: Take into account day name width when setting calendar column width. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-05-17 21:21:08 +03:00 committed by Alexandre Julliard
parent 7912acaab9
commit 2f2651a14e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/comctl32/monthcal.c
View File

@ -118,7 +118,6 @@ typedef struct
HFONT hFont; HFONT hFont;
HFONT hBoldFont; HFONT hBoldFont;
int textHeight; int textHeight;
int textWidth;
int height_increment; int height_increment;
int width_increment; int width_increment;
INT delta; /* scroll rate; # of months that the */ INT delta; /* scroll rate; # of months that the */
@ -2494,9 +2493,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr)
INT xdiv, dx, dy, i, j, x, y, c_dx, c_dy; INT xdiv, dx, dy, i, j, x, y, c_dx, c_dy;
WCHAR buff[80]; WCHAR buff[80];
TEXTMETRICW tm; TEXTMETRICW tm;
SIZE size, sz; INT day_width;
RECT client; RECT client;
HFONT font; HFONT font;
SIZE size;
HDC hdc; HDC hdc;
GetClientRect(infoPtr->hwndSelf, &client); GetClientRect(infoPtr->hwndSelf, &client);
@ -2508,27 +2508,30 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr)
GetTextMetricsW(hdc, &tm); GetTextMetricsW(hdc, &tm);
infoPtr->textHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading; infoPtr->textHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading;
/* find largest abbreviated day name for current locale */ /* find widest day name for current locale and font */
size.cx = sz.cx = 0; day_width = 0;
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
{ {
SIZE sz;
if (get_localized_dayname(infoPtr, i, buff, countof(buff))) if (get_localized_dayname(infoPtr, i, buff, countof(buff)))
{ {
GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz);
if (sz.cx > size.cx) size.cx = sz.cx; if (sz.cx > day_width) day_width = sz.cx;
} }
else /* locale independent fallback on failure */ else /* locale independent fallback on failure */
{ {
static const WCHAR SunW[] = { 'S','u','n',0 }; static const WCHAR sunW[] = { 'S','u','n' };
GetTextExtentPoint32W(hdc, sunW, countof(sunW), &sz);
GetTextExtentPoint32W(hdc, SunW, lstrlenW(SunW), &size); day_width = sz.cx;
break; break;
} }
} }
infoPtr->textWidth = size.cx + 2; day_width += 2;
/* recalculate the height and width increments and offsets */ /* recalculate the height and width increments and offsets */
size.cx = 0;
GetTextExtentPoint32W(hdc, O0W, 2, &size); GetTextExtentPoint32W(hdc, O0W, 2, &size);
/* restore the originally selected font */ /* restore the originally selected font */
@ -2537,7 +2540,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr)
xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7;
infoPtr->width_increment = size.cx * 2 + 4; infoPtr->width_increment = max(day_width, size.cx * 2 + 4);
infoPtr->height_increment = infoPtr->textHeight; infoPtr->height_increment = infoPtr->textHeight;
/* calculate title area */ /* calculate title area */