Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32SS]

Browse source 
- Fix hilite text with objects. Mirror changes.

svn path=/trunk/; revision=68936
This commit is contained in:
James Tabor 2015-09-03 14:29:53 +00:00
parent c10459d14a
commit 42a15c9829
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/win32ss/user/ntuser/draw.c
View file

@ -988,13 +988,20 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
hFont = GreCreateFontIndirectW(&lf); hFont = GreCreateFontIndirectW(&lf);
/* save font */ /* save font */
hOldFont = NtGdiSelectFont(dc, hFont); hOldFont = NtGdiSelectFont(dc, hFont);
if(uFlags & DFCS_INACTIVE)
if ((uFlags & 0xff) == DFCS_MENUARROWUP ||
(uFlags & 0xff) == DFCS_MENUARROWDOWN )
{ {
/* draw shadow */ #if 0
IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); if (uFlags & DFCS_INACTIVE)
GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1); {
/* draw shadow */
IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT));
GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1);
}
#endif
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 */
GreTextOutW(dc, r->left, r->top, &Symbol, 1); GreTextOutW(dc, r->left, r->top, &Symbol, 1);
/* restore previous settings */ /* restore previous settings */

20
reactos/win32ss/user/user32/windows/draw.c
View file

@ -1019,16 +1019,20 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
hFont = CreateFontIndirect(&lf); hFont = CreateFontIndirect(&lf);
/* save font */ /* save font */
hOldFont = SelectObject(dc, hFont); hOldFont = SelectObject(dc, hFont);
// FIXME selecting color doesn't work
#if 0 if ((uFlags & 0xff) == DFCS_MENUARROWUP ||
if(uFlags & DFCS_INACTIVE) (uFlags & 0xff) == DFCS_MENUARROWDOWN )
{ {
/* draw shadow */ #if 0
SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); if (uFlags & DFCS_INACTIVE)
TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1); {
} /* draw shadow */
SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT));
TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1);
}
#endif #endif
SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT));
}
/* draw selected symbol */ /* draw selected symbol */
TextOut(dc, r->left, r->top, &Symbol, 1); TextOut(dc, r->left, r->top, &Symbol, 1);
/* restore previous settings */ /* restore previous settings */