Skip to content

W
wine-cw
Commit 3a0b40ff authored by Rein Klazes's avatar Rein Klazes Committed by Alexandre Julliard
Browse files
Options

menu: Take the MF_DEFAULT flag in to account in MENU_CalcItemSize.

parent 3e47c82e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
dlls/user/menu.c
View file @ 3a0b40ff
...@@ -1026,10 +1026,14 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, ...@@ -1026,10 +1026,14 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
/* it must be a text item - unless it's the system menu */ /* it must be a text item - unless it's the system menu */
if (!(lpitem->fType & MF_SYSMENU) && lpitem->text) { if (!(lpitem->fType & MF_SYSMENU) && lpitem->text) {
HFONT hfontOld = NULL;
RECT rc = lpitem->rect; RECT rc = lpitem->rect;
LONG txtheight, txtwidth; LONG txtheight, txtwidth;
lpitem->xTab = 0; lpitem->xTab = 0;
if ( lpitem->fState & MFS_DEFAULT ) {
hfontOld = SelectObject( hdc, get_menu_font(TRUE) );
}
if (menuBar) { if (menuBar) {
txtheight = DrawTextW( hdc, lpitem->text, -1, &rc, txtheight = DrawTextW( hdc, lpitem->text, -1, &rc,
DT_SINGLELINE|DT_CALCRECT); DT_SINGLELINE|DT_CALCRECT);
...@@ -1071,6 +1075,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, ...@@ -1071,6 +1075,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
itemheight = max( itemheight, itemheight = max( itemheight,
max( txtheight + 2, menucharsize.cy + 4)); max( txtheight + 2, menucharsize.cy + 4));
} }
if (hfontOld) SelectObject (hdc, hfontOld);
} else if( menuBar) { } else if( menuBar) {
itemheight = max( itemheight, GetSystemMetrics(SM_CYMENU)-1); itemheight = max( itemheight, GetSystemMetrics(SM_CYMENU)-1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment