Kevin Koltzau : user32:
Draw menu item bitmaps in the correct location when the scroll arrows
are active .
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Apr 27 06:44:00 CDT 2007
Module: wine
Branch: master
Commit: 069f5b90ae79593d5a9acfba292d9a26da6b2506
URL: http://source.winehq.org/git/wine.git/?a=commit;h=069f5b90ae79593d5a9acfba292d9a26da6b2506
Author: Kevin Koltzau <kevin at plop.org>
Date: Thu Apr 26 22:03:06 2007 -0400
user32: Draw menu item bitmaps in the correct location when the scroll arrows are active.
---
dlls/user32/menu.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 63cb444..4aca343 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -1515,7 +1515,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
if( menuBar && !(lpitem->hbmpItem == HBMMENU_CALLBACK))
bmprc.top = 0;
else
- bmprc.top = (lpitem->rect.bottom - lpitem->rect.top -
+ bmprc.top = (rect.bottom - rect.top -
lpitem->bmpsize.cy) / 2;
bmprc.bottom = bmprc.top + lpitem->bmpsize.cy;
}
@@ -1570,7 +1570,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
!( checked && (menu->dwStyle & MNS_CHECKORBMP))) {
POINT origorg;
/* some applications make this assumption on the DC's origin */
- SetViewportOrgEx( hdc, lpitem->rect.left, lpitem->rect.top, &origorg);
+ SetViewportOrgEx( hdc, rect.left, rect.top, &origorg);
MENU_DrawBitmapItem(hdc, lpitem, &bmprc, hmenu, hwndOwner,
odaction, FALSE);
SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL);
@@ -1588,7 +1588,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
{ /* Draw the bitmap */
POINT origorg;
- SetViewportOrgEx( hdc, lpitem->rect.left, lpitem->rect.top, &origorg);
+ SetViewportOrgEx( hdc, rect.left, rect.top, &origorg);
MENU_DrawBitmapItem( hdc, lpitem, &bmprc, hmenu, hwndOwner,
odaction, menuBar);
SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL);
More information about the wine-cvs
mailing list