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

Removed no longer used average width calculation.

This commit is contained in:
Alexandre Julliard 2002-01-22 20:09:44 +00:00
parent de46c22917
commit 9f5922089a
1 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
windows/dialog.c
View File

@ -155,40 +155,13 @@ static BOOL DIALOG_GetCharSizeFromDC( HDC hDC, HFONT hFont, SIZE * pSize )
TEXTMETRICA tm; TEXTMETRICA tm;
memset(&tm,0,sizeof(tm)); memset(&tm,0,sizeof(tm));
if (hFont) hFontPrev = SelectFont(hDC,hFont); if (hFont) hFontPrev = SelectFont(hDC,hFont);
if (GetTextMetricsA(hDC,&tm)) if ((Success = GetTextMetricsA(hDC,&tm)))
{ {
pSize->cx = tm.tmAveCharWidth; pSize->cx = tm.tmAveCharWidth;
pSize->cy = tm.tmHeight; pSize->cy = tm.tmHeight;
TRACE("Using tm: %ldx%ld (dlg: %ld x %ld) (%s)\n",
/* if variable width font */
if (tm.tmPitchAndFamily & TMPF_FIXED_PITCH)
{
SIZE total;
const char* szAvgChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
/* Calculate a true average as opposed to the one returned
* by tmAveCharWidth. This works better when dealing with
* proportional spaced fonts and (more important) that's
* how Microsoft's dialog creation code calculates the size
* of the font
*/
if (GetTextExtentPointA(hDC,szAvgChars,sizeof(szAvgChars),&total))
{
/* round up */
pSize->cx = ((2*total.cx/sizeof(szAvgChars)) + 1)/2;
Success = TRUE;
}
}
else
{
Success = TRUE;
}
/* Use the text metrics */
TRACE("Using tm: %ldx%ld (dlg: %ld x %ld) (%s)\n",
tm.tmAveCharWidth, tm.tmHeight, pSize->cx, pSize->cy, tm.tmAveCharWidth, tm.tmHeight, pSize->cx, pSize->cy,
tm.tmPitchAndFamily & TMPF_FIXED_PITCH ? "variable" : "fixed"); tm.tmPitchAndFamily & TMPF_FIXED_PITCH ? "variable" : "fixed");
pSize->cx = tm.tmAveCharWidth;
pSize->cy = tm.tmHeight;
} }
/* select the original font */ /* select the original font */
if (hFontPrev) SelectFont(hDC,hFontPrev); if (hFontPrev) SelectFont(hDC,hFontPrev);