Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-19 12:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.13][WIN32SS][NTUSER][USER32] Fix menu checkmarks (#2009)

Browse source 
This will fix regression CORE-16470
"Black squares in menubar of Abiword 2.6.8"

This is a partial revert of the guilty rev 0.4.13-dev-702-g
1e91a1690d
- Don't change background mode.

And is an addendum to CORE-13211.

test results LGTM:
https://reactos.org/testman/compare.php?ids=69593,69596 VBox
https://reactos.org/testman/compare.php?ids=69594,69597 KVM

fix cherry picked from commit 0.4.14-dev-186-g
b3033b81a4
This commit is contained in:
Katayama Hirofumi MZ 2019-11-01 09:52:18 +09:00 committed by Joachim Henze
parent c35c7f2c80
commit 9a845598dc
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
win32ss/user/ntuser/draw.c
View file

@ -955,7 +955,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
HFONT hFont, hOldFont; HFONT hFont, hOldFont;
WCHAR Symbol; WCHAR Symbol;
RECT myr; RECT myr;
INT cxy, nBkMode; INT cxy;
cxy = UITOOLS_MakeSquareRect(r, &myr); cxy = UITOOLS_MakeSquareRect(r, &myr);
switch(uFlags & 0xff) switch(uFlags & 0xff)
{ {
@ -1014,9 +1014,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
} }
/* draw selected symbol */ /* draw selected symbol */
nBkMode = IntGdiSetBkMode(dc, TRANSPARENT);
GreTextOutW(dc, myr.left, myr.top, &Symbol, 1); GreTextOutW(dc, myr.left, myr.top, &Symbol, 1);
IntGdiSetBkMode(dc, nBkMode);
/* restore previous settings */ /* restore previous settings */
NtGdiSelectFont(dc, hOldFont); NtGdiSelectFont(dc, hOldFont);
GreDeleteObject(hFont); GreDeleteObject(hFont);

4
win32ss/user/user32/windows/draw.c
View file

@ -977,7 +977,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
HFONT hFont, hOldFont; HFONT hFont, hOldFont;
TCHAR Symbol; TCHAR Symbol;
RECT myr; RECT myr;
INT cxy, nBkMode; INT cxy;
cxy = UITOOLS_MakeSquareRect(r, &myr); cxy = UITOOLS_MakeSquareRect(r, &myr);
switch(uFlags & 0xff) switch(uFlags & 0xff)
{ {
@ -1034,9 +1034,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
} }
/* draw selected symbol */ /* draw selected symbol */
nBkMode = SetBkMode(dc, TRANSPARENT);
TextOut(dc, myr.left, myr.top, &Symbol, 1); TextOut(dc, myr.left, myr.top, &Symbol, 1);
SetBkMode(dc, nBkMode);
/* restore previous settings */ /* restore previous settings */
SelectObject(dc, hOldFont); SelectObject(dc, hOldFont);
DeleteObject(hFont); DeleteObject(hFont);