From 4167047357d1c596abde22d3616c5ee976f5881d Mon Sep 17 00:00:00 2001 From: Juan Lang Date: Fri, 23 May 2008 09:02:54 -0700 Subject: [PATCH] Fix menu drawing when a menu contains items with bitmaps and no text --- dlls/user32/menu.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 49de5e1..fa946e1 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1017,8 +1017,11 @@ static void MENU_CalcItemSize( HDC hdc, /* Keep the size of the bitmap in callback mode to be able * to draw it correctly */ lpitem->bmpsize = size; - lppop->maxBmpSize.cx = max( lppop->maxBmpSize.cx, size.cx); - lppop->maxBmpSize.cy = max( lppop->maxBmpSize.cy, size.cy); + /* Only update the max bitmap size if the item also contains text */ + if (lpitem->text) { + lppop->maxBmpSize.cx = max( lppop->maxBmpSize.cx, size.cx); + lppop->maxBmpSize.cy = max( lppop->maxBmpSize.cy, size.cy); + } lpitem->rect.right += size.cx + 2; itemheight = size.cy + 2; } -- 1.4.1