Skip to content

W
wine-winehq
Commit c4056230 authored by Lauri Tulmin's avatar Lauri Tulmin Committed by Alexandre Julliard
Browse files
Options

Add more tests for text placement in single and multiline edit

controls. Some of the tests are marked as todo.
parent 09b0abaa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 19 deletions
dlls/user/edit.c
View file @ c4056230
......@@ -2216,35 +2216,26 @@ static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc)
LONG_PTR ExStyle;
CopyRect(&es->format_rect, rc);
if (es->style & ES_MULTILINE)
{
ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE);
if ((es->style & WS_POPUP) && !(ExStyle & WS_EX_CLIENTEDGE)) {
if (es->style & WS_BORDER) {
INT bw = GetSystemMetrics(SM_CXBORDER) + 1;
es->format_rect.left += bw;
es->format_rect.right -= bw;
es->format_rect.top += bw;
es->format_rect.bottom -= bw;
}
}
else
{
ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE);
if (ExStyle & WS_EX_CLIENTEDGE) {
if (es->line_height + 2 <=
es->format_rect.bottom - es->format_rect.top) {
es->format_rect.top++;
es->format_rect.bottom--;
}
} else if (es->style & WS_BORDER) {
INT bw = GetSystemMetrics(SM_CXBORDER) + 1;
es->format_rect.left += bw;
es->format_rect.right -= bw;
if (es->line_height + 2 * bw <=
es->format_rect.bottom - es->format_rect.top) {
es->format_rect.top += bw;
es->format_rect.bottom -= bw;
}
}
} else {
if (es->line_height + 2 <=
es->format_rect.bottom - es->format_rect.top) {
es->format_rect.top++;
es->format_rect.bottom--;
}
es->format_rect.left++;
es->format_rect.right--;
}
es->format_rect.left += es->left_margin;
es->format_rect.right -= es->right_margin;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment