gdi32: Intersect the background text box with the clip rectangle in device units.

This commit is contained in:
Huw Davies 2012-02-09 11:19:02 +00:00 committed by Alexandre Julliard
parent 1eca24bd6b
commit d3bfa44d53
1 changed files with 2 additions and 8 deletions

View File

@ -2346,14 +2346,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
text_box.top = y - tm.tmAscent;
text_box.bottom = y + tm.tmDescent;
if(flags & ETO_CLIPPED)
{
text_box.left = max(lprect->left, text_box.left);
text_box.right = min(lprect->right, text_box.right);
text_box.top = max(lprect->top, text_box.top);
text_box.bottom = min(lprect->bottom, text_box.bottom);
}
if(text_box.left < text_box.right && text_box.top < text_box.bottom)
if (flags & ETO_CLIPPED) intersect_rect( &text_box, &text_box, &rc );
if (!is_rect_empty( &text_box ))
physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &text_box, NULL, 0, NULL );
}
}