[ros-diffs] [gadamopoulos] 47522: [win32k[win32k] -Allow menus to be shown over the taskbar See issue #5415 for more details.

gadamopoulos at svn.reactos.org gadamopoulos at svn.reactos.org
Wed Jun 2 18:55:22 CEST 2010


Author: gadamopoulos
Date: Wed Jun  2 18:55:21 2010
New Revision: 47522

URL: http://svn.reactos.org/svn/reactos?rev=47522&view=rev
Log:
[win32k[win32k]
-Allow menus to be shown over the taskbar
See issue #5415 for more details.

Modified:
    trunk/reactos/dll/win32/user32/windows/menu.c

Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/menu.c?rev=47522&r1=47521&r2=47522&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Jun  2 18:55:21 2010
@@ -1605,25 +1605,25 @@
     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 < info.rcWork.left ) x = info.rcWork.left;
-
-    if( y + height > info.rcWork.bottom)
+        if( x + width > info.rcMonitor.right)
+            x = info.rcMonitor.right - width;
+    }
+    if( x < info.rcMonitor.left ) x = info.rcMonitor.left;
+
+    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 < info.rcWork.top ) y = info.rcWork.top;
+        if( y + height > info.rcMonitor.bottom)
+            y = info.rcMonitor.bottom - height;
+    }
+    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,




More information about the Ros-diffs mailing list