Skip to content

W
wine-cw
Commit e1d7ff95 authored by Michael Kaufmann's avatar Michael Kaufmann Committed by Alexandre Julliard
Browse files
Options

- Fix text placement.

- Paint the border correctly if its size is bigger than 1 pixel. - Don't paint text over the border. - Fix the edit control placement tests: Put the edit box in a parent window. - Tidied up the edit control tests.
parent 14a6d899
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 26 deletions
dlls/user/edit.c
View file @ e1d7ff95
...@@ -2294,28 +2294,33 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es) ...@@ -2294,28 +2294,33 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es)
static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc) static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc)
{ {
LONG_PTR ExStyle; LONG_PTR ExStyle;
INT bw, bh;
CopyRect(&es->format_rect, rc);
ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE); ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE);
if ((es->style & WS_POPUP) && !(ExStyle & WS_EX_CLIENTEDGE)) {
if (es->style & WS_BORDER) { CopyRect(&es->format_rect, rc);
INT bw = GetSystemMetrics(SM_CXBORDER) + 1;
es->format_rect.left += bw; if (ExStyle & WS_EX_CLIENTEDGE) {
es->format_rect.right -= bw; es->format_rect.left++;
if (es->line_height + 2 * bw <= es->format_rect.right--;
es->format_rect.bottom - es->format_rect.top) {
es->format_rect.top += bw; if (es->format_rect.bottom - es->format_rect.top
es->format_rect.bottom -= bw; >= es->line_height + 2)
} {
}
} else {
if (es->line_height + 2 <=
es->format_rect.bottom - es->format_rect.top) {
es->format_rect.top++; es->format_rect.top++;
es->format_rect.bottom--; es->format_rect.bottom--;
} }
es->format_rect.left++; }
es->format_rect.right--; else if (es->style & WS_BORDER) {
bw = GetSystemMetrics(SM_CXBORDER) + 1;
bh = GetSystemMetrics(SM_CYBORDER) + 1;
es->format_rect.left += bw;
es->format_rect.right -= bw;
if (es->format_rect.bottom - es->format_rect.top
>= es->line_height + 2 * bh)
{
es->format_rect.top += bh;
es->format_rect.bottom -= bh;
}
} }
es->format_rect.left += es->left_margin; es->format_rect.left += es->left_margin;
...@@ -4712,6 +4717,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) ...@@ -4712,6 +4717,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc)
RECT rcRgn; RECT rcRgn;
HBRUSH brush; HBRUSH brush;
HBRUSH old_brush; HBRUSH old_brush;
INT bw, bh;
BOOL rev = es->bEnableState && BOOL rev = es->bEnableState &&
((es->flags & EF_FOCUSED) || ((es->flags & EF_FOCUSED) ||
(es->style & ES_NOHIDESEL)); (es->style & ES_NOHIDESEL));
...@@ -4725,20 +4731,32 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) ...@@ -4725,20 +4731,32 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc)
/* paint the border and the background */ /* paint the border and the background */
IntersectClipRect(dc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); IntersectClipRect(dc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
if(es->style & WS_BORDER) { if(es->style & WS_BORDER) {
bw = GetSystemMetrics(SM_CXBORDER);
bh = GetSystemMetrics(SM_CYBORDER);
rc = rcClient; rc = rcClient;
if(es->style & ES_MULTILINE) { if(es->style & ES_MULTILINE) {
if(es->style & WS_HSCROLL) rc.bottom++; if(es->style & WS_HSCROLL) rc.bottom+=bh;
if(es->style & WS_VSCROLL) rc.right++; if(es->style & WS_VSCROLL) rc.right+=bw;
} }
old_brush = SelectObject(dc, brush);
Rectangle(dc, rc.left, rc.top, rc.right, rc.bottom); /* Draw the frame. Same code as in nonclient.c */
old_brush = SelectObject(dc, GetSysColorBrush(COLOR_WINDOWFRAME));
PatBlt(dc, rc.left, rc.top, rc.right - rc.left, bh, PATCOPY);
PatBlt(dc, rc.left, rc.top, bw, rc.bottom - rc.top, PATCOPY);
PatBlt(dc, rc.left, rc.bottom - 1, rc.right - rc.left, -bw, PATCOPY);
PatBlt(dc, rc.right - 1, rc.top, -bw, rc.bottom - rc.top, PATCOPY);
SelectObject(dc, old_brush); SelectObject(dc, old_brush);
/* Keep the border clean */
IntersectClipRect(dc, rc.left+bw, rc.top+bh,
max(rc.right-bw, rc.left+bw), max(rc.bottom-bh, rc.top+bh));
} }
else {
GetClipBox(dc, &rc); GetClipBox(dc, &rc);
FillRect(dc, &rc, brush); FillRect(dc, &rc, brush);
}
IntersectClipRect(dc, es->format_rect.left, IntersectClipRect(dc, es->format_rect.left,
es->format_rect.top, es->format_rect.top,
es->format_rect.right, es->format_rect.right,
......
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