From 4f491e282e688496992daa9ea82f8edaf7bbfc22 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Wed, 2 Jun 2010 16:55:21 +0000 Subject: [PATCH] [win32k[win32k] -Allow menus to be shown over the taskbar See issue #5415 for more details. svn path=/trunk/; revision=47522 --- reactos/dll/win32/user32/windows/menu.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c index d5723bb3271..eed233f4947 100644 --- a/reactos/dll/win32/user32/windows/menu.c +++ b/reactos/dll/win32/user32/windows/menu.c @@ -1605,25 +1605,25 @@ static BOOL FASTCALL MenuShowPopup(HWND hwndOwner, HMENU hmenu, UINT id, UINT fl if( flags & TPM_BOTTOMALIGN ) y -= height; if( flags & TPM_VCENTERALIGN ) y -= height / 2; - if( x + width > info.rcWork.right) + if( x + width > info.rcMonitor.right) { if( xanchor && x >= width - xanchor ) x -= width - xanchor; - if( x + width > info.rcWork.right) - x = info.rcWork.right - width; + if( x + width > info.rcMonitor.right) + x = info.rcMonitor.right - width; } - if( x < info.rcWork.left ) x = info.rcWork.left; + if( x < info.rcMonitor.left ) x = info.rcMonitor.left; - if( y + height > info.rcWork.bottom) + if( y + height > info.rcMonitor.bottom) { if( yanchor && y >= height + yanchor ) y -= height + yanchor; - if( y + height > info.rcWork.bottom) - y = info.rcWork.bottom - height; + if( y + height > info.rcMonitor.bottom) + y = info.rcMonitor.bottom - height; } - if( y < info.rcWork.top ) y = info.rcWork.top; + if( y < info.rcMonitor.top ) y = info.rcMonitor.top; /* NOTE: In Windows, top menu popup is not owned. */ MenuInfo.Wnd = CreateWindowExW( 0, POPUPMENU_CLASS_ATOMW, NULL,