Author: jimtabor
Date: Thu Sep 3 14:29:53 2015
New Revision: 68936
URL: http://svn.reactos.org/svn/reactos?rev=68936&view=rev
Log:
[Win32SS]
- Fix hilite text with objects. Mirror changes.
Modified:
trunk/reactos/win32ss/user/ntuser/draw.c
trunk/reactos/win32ss/user/user32/windows/draw.c
Modified: trunk/reactos/win32ss/user/ntuser/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/draw.c?rev=68936&r1=68935&r2=68936&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/draw.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/draw.c [iso-8859-1] Thu Sep 3
14:29:53 2015
@@ -988,13 +988,20 @@
hFont = GreCreateFontIndirectW(&lf);
/* save font */
hOldFont = NtGdiSelectFont(dc, hFont);
- if(uFlags & DFCS_INACTIVE)
- {
- /* draw shadow */
- IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT));
- GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1);
- }
- IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ?
COLOR_BTNSHADOW : COLOR_BTNTEXT));
+
+ if ((uFlags & 0xff) == DFCS_MENUARROWUP ||
+ (uFlags & 0xff) == DFCS_MENUARROWDOWN )
+ {
+#if 0
+ if (uFlags & DFCS_INACTIVE)
+ {
+ /* 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));
+ }
/* draw selected symbol */
GreTextOutW(dc, r->left, r->top, &Symbol, 1);
/* restore previous settings */
Modified: trunk/reactos/win32ss/user/user32/windows/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/windows/draw.c?rev=68936&r1=68935&r2=68936&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Thu Sep 3
14:29:53 2015
@@ -1019,16 +1019,20 @@
hFont = CreateFontIndirect(&lf);
/* save font */
hOldFont = SelectObject(dc, hFont);
- // FIXME selecting color doesn't work
+
+ if ((uFlags & 0xff) == DFCS_MENUARROWUP ||
+ (uFlags & 0xff) == DFCS_MENUARROWDOWN )
+ {
#if 0
- if(uFlags & DFCS_INACTIVE)
- {
- /* draw shadow */
- SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT));
- TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1);
- }
- SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW :
COLOR_BTNTEXT));
+ if (uFlags & DFCS_INACTIVE)
+ {
+ /* draw shadow */
+ SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT));
+ TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1);
+ }
#endif
+ SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW
: COLOR_BTNTEXT));
+ }
/* draw selected symbol */
TextOut(dc, r->left, r->top, &Symbol, 1);
/* restore previous settings */
