Skip to content

W
wine-winehq
Commit 07763aad authored by Michael Kaufmann's avatar Michael Kaufmann Committed by Alexandre Julliard
Browse files
Options

Paint the background with the correct color if WS_BORDER.

parent 854bfc4b
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
dlls/user/edit.c
View file @ 07763aad
...@@ -4677,6 +4677,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) ...@@ -4677,6 +4677,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc)
RECT rcLine; RECT rcLine;
RECT rcRgn; RECT rcRgn;
HBRUSH brush; HBRUSH brush;
HBRUSH old_brush;
BOOL rev = es->bEnableState && BOOL rev = es->bEnableState &&
((es->flags & EF_FOCUSED) || ((es->flags & EF_FOCUSED) ||
(es->style & ES_NOHIDESEL)); (es->style & ES_NOHIDESEL));
...@@ -4684,21 +4685,25 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) ...@@ -4684,21 +4685,25 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc)
GetClientRect(es->hwndSelf, &rcClient); GetClientRect(es->hwndSelf, &rcClient);
/* paint the background */ /* get the background brush */
if (!(brush = EDIT_NotifyCtlColor(es, dc))) if (!(brush = EDIT_NotifyCtlColor(es, dc)))
brush = (HBRUSH)GetStockObject(WHITE_BRUSH); brush = (HBRUSH)GetStockObject(WHITE_BRUSH);
IntersectClipRect(dc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
GetClipBox(dc, &rc);
FillRect(dc, &rc, brush);
/* draw the border */ /* paint the border and the background */
IntersectClipRect(dc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
if(es->style & WS_BORDER) { if(es->style & WS_BORDER) {
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++;
if(es->style & WS_VSCROLL) rc.right++; if(es->style & WS_VSCROLL) rc.right++;
} }
old_brush = SelectObject(dc, brush);
Rectangle(dc, rc.left, rc.top, rc.right, rc.bottom); Rectangle(dc, rc.left, rc.top, rc.right, rc.bottom);
SelectObject(dc, old_brush);
}
else {
GetClipBox(dc, &rc);
FillRect(dc, &rc, brush);
} }
IntersectClipRect(dc, es->format_rect.left, IntersectClipRect(dc, es->format_rect.left,
es->format_rect.top, es->format_rect.top,
......
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