Author: fireball
Date: Sun Mar 7 10:44:18 2010
New Revision: 45981
URL:
http://svn.reactos.org/svn/reactos?rev=45981&view=rev
Log:
Maarten Kroese
- Apply same Marlett-font charset fix to the system menu drawing.
- Also slightly adjust symbol's position. (Should be sent upstream).
Modified:
branches/arwinss/reactos/dll/win32/user32/menu.c
Modified: branches/arwinss/reactos/dll/win32/user32/menu.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Sun Mar 7 10:44:18
2010
@@ -954,14 +954,14 @@
/* draw the magic bitmaps using marlett font characters */
/* FIXME: fontsize and the position (x,y) could probably be better */
HFONT hfont, hfontsav;
- LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL,
- 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0,
+ LOGFONTW logfont = { 0, 0, 0, 0, FW_DONTCARE,
+ 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0,
{
'M','a','r','l','e','t','t',0 }
};
logfont.lfHeight = min( h, w) - 5 ;
TRACE(" height %d rect %s\n", logfont.lfHeight, wine_dbgstr_rect(
rect));
hfont = CreateFontIndirectW( &logfont);
hfontsav = SelectObject(hdc, hfont);
- TextOutW( hdc, rect->left, rect->top + 2, &bmchr, 1);
+ TextOutW( hdc, rect->left, rect->top + 4, &bmchr, 1);
SelectObject(hdc, hfontsav);
DeleteObject( hfont);
}