Take font metrics into account for EC_USEFONTINFO margins.

This commit is contained in:
Achim Kaiser 2003-05-06 18:23:17 +00:00 committed by Alexandre Julliard
parent fcbd0da4a2
commit 6d3ce418be
1 changed files with 27 additions and 4 deletions

View File

@ -3296,25 +3296,48 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit)
* EM_SETMARGINS * EM_SETMARGINS
* *
* EC_USEFONTINFO is used as a left or right value i.e. lParam and not as an * EC_USEFONTINFO is used as a left or right value i.e. lParam and not as an
* action wParam despite what the docs say. EC_USEFONTINFO means one third * action wParam despite what the docs say. EC_USEFONTINFO calculates the
* of the char's width, according to the new docs. * margin according to the textmetrics of the current font.
*
* FIXME - With TrueType or vector fonts EC_USEFONTINFO currently sets one third
* of the char's width as the margin, but this is not how Windows handles this.
* For all other fonts Windows sets the margins to zero.
* *
*/ */
static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, static void EDIT_EM_SetMargins(EDITSTATE *es, INT action,
INT left, INT right) INT left, INT right)
{ {
TEXTMETRICW tm;
INT default_left_margin = 0; /* in pixels */
INT default_right_margin = 0; /* in pixels */
/* Set the default margins depending on the font */
if (es->font && (left == EC_USEFONTINFO || right == EC_USEFONTINFO)) {
HDC dc = GetDC(es->hwndSelf);
HFONT old_font = SelectObject(dc, es->font);
GetTextMetricsW(dc, &tm);
/* The default margins are only non zero for TrueType or Vector fonts */
if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) {
/* This must be calculated more exactly! But how? */
default_left_margin = tm.tmAveCharWidth / 3;
default_right_margin = tm.tmAveCharWidth / 3;
}
SelectObject(dc, old_font);
ReleaseDC(es->hwndSelf, dc);
}
if (action & EC_LEFTMARGIN) { if (action & EC_LEFTMARGIN) {
if (left != EC_USEFONTINFO) if (left != EC_USEFONTINFO)
es->left_margin = left; es->left_margin = left;
else else
es->left_margin = es->char_width / 3; es->left_margin = default_left_margin;
} }
if (action & EC_RIGHTMARGIN) { if (action & EC_RIGHTMARGIN) {
if (right != EC_USEFONTINFO) if (right != EC_USEFONTINFO)
es->right_margin = right; es->right_margin = right;
else else
es->right_margin = es->char_width / 3; es->right_margin = default_right_margin;
} }
TRACE("left=%d, right=%d\n", es->left_margin, es->right_margin); TRACE("left=%d, right=%d\n", es->left_margin, es->right_margin);
} }