[PATCH] comctl32: Fix background and text color for DrawStatusText().
Nikolay Sivov
nsivov at codeweavers.com
Sun Aug 12 14:40:00 CDT 2018
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/comctl32/commctrl.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 1117ec43e9..45b93bdc8b 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -487,20 +487,24 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style)
{
RECT r = *lprc;
UINT border = BDR_SUNKENOUTER;
+ COLORREF oldbkcolor;
if (style & SBT_POPOUT)
border = BDR_RAISEDOUTER;
else if (style & SBT_NOBORDERS)
border = 0;
- DrawEdge (hdc, &r, border, BF_RECT|BF_ADJUST);
+ oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace);
+ DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST);
/* now draw text */
if (text) {
int oldbkmode = SetBkMode (hdc, TRANSPARENT);
+ COLORREF oldtextcolor;
UINT align = DT_LEFT;
int strCnt = 0;
+ oldtextcolor = SetTextColor (hdc, comctl32_color.clrBtnText);
if (style & SBT_RTLREADING)
FIXME("Unsupported RTL style!\n");
r.left += 3;
@@ -520,8 +524,11 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style)
} while(*text++);
if (strCnt) DrawTextW (hdc, text - strCnt, -1, &r, align|DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX);
- SetBkMode(hdc, oldbkmode);
+ SetBkMode (hdc, oldbkmode);
+ SetTextColor (hdc, oldtextcolor);
}
+
+ SetBkColor (hdc, oldbkcolor);
}
--
2.18.0
More information about the wine-devel
mailing list