Changeset 2458 for trunk/src/user32/new/menu.cpp

Timestamp:

Jan 16, 2000, 7:17:13 PM (26 years ago)

Author:

cbratschi

Message:

menu and frame changes

File:

• trunk/src/user32/new/menu.cpp (modified) (12 diffs)

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.10 2000-01-15 14:18:16 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.11 2000-01-16 18:17:10 cbratschi Exp $*/
 /*
  * Menu functions
@@ -104 +104 @@
 #define TPM_BUTTONDOWN          0x40000000              /* menu was clicked before tracking */
 #define TPM_POPUPMENU           0x20000000              /* menu is a popup menu */
+#define TPM_CAPTIONSYSMENU      0x10000000
 
   /* popup menu shade thickness */
@@ -2014 +2015 @@
  */
 static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu,
-                                  BOOL selectFirst, UINT wFlags )
+                                  BOOL selectFirst, UINT wFlags,POINT *pt)
 {
     RECT rect;
@@ -2071 +2072 @@
         MENU_InitSysMenuPopup(item->hSubMenu,GetWindowLongA(menu->hWnd,GWL_STYLE), GetClassLongA(menu->hWnd, GCL_STYLE));
 
-        if (win32wnd) win32wnd->GetSysPopupPos(&rect);
-        rect.top = rect.bottom;
-        rect.right = GetSystemMetrics(SM_CXSIZE);
-        rect.bottom = GetSystemMetrics(SM_CYSIZE);
+        if ((wFlags & TPM_CAPTIONSYSMENU) && pt)
+        {
+          rect.top = pt->y;
+          rect.left = pt->x;
+          rect.bottom = rect.right = 0;
+        } else
+        {
+          if (win32wnd) win32wnd->GetSysPopupPos(&rect);
+          rect.top = rect.bottom;
+          rect.right = GetSystemMetrics(SM_CXSIZE);
+          rect.bottom = GetSystemMetrics(SM_CYSIZE);
+        }
     }
     else
@@ -2185 +2194 @@
     }
     else
-        pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hMenu, TRUE, wFlags);
+        pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hMenu, TRUE, wFlags,&pmt->pt);
 
     return -1;
@@ -2243 +2252 @@
             if(!(item->fState & MF_MOUSESELECT ))
             {
-                pmt->hCurrentMenu = MENU_ShowSubPopup( pmt->hOwnerWnd, hPtMenu, FALSE, wFlags );
+                pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,hPtMenu,FALSE,wFlags,&pmt->pt);
             }
 
@@ -2321 +2330 @@
     {
             MENU_SwitchTracking( pmt, hPtMenu, id );
-            pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags);
+            pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hPtMenu, FALSE, wFlags,&pmt->pt);
     }
     return TRUE;
@@ -2510 +2519 @@
             if( !MENU_SuspendPopup( pmt, WM_KEYDOWN ) )
                 pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,
-                                                pmt->hTopMenu, TRUE, wFlags);
+                                                pmt->hTopMenu, TRUE, wFlags,&pmt->pt);
         }
     }
@@ -2538 +2547 @@
 
         hmenutmp = pmt->hCurrentMenu;
-        pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hmenutmp, TRUE, wFlags);
+        pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, hmenutmp, TRUE, wFlags,&pmt->pt);
 
         /* if subpopup was displayed then we are done */
@@ -2568 +2577 @@
             if( !MENU_SuspendPopup(pmt, WM_KEYDOWN) )
                 pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,
-                                                       pmt->hTopMenu, TRUE, wFlags);
+                                                       pmt->hTopMenu, TRUE, wFlags,&pmt->pt);
     }
 }
@@ -2697 +2706 @@
                     menu = (POPUPMENU*)mt.hCurrentMenu;
                     if (!(menu->wFlags & MF_POPUP))
-                        mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, mt.hTopMenu, TRUE, wFlags);
+                        mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, mt.hTopMenu, TRUE, wFlags,&mt.pt);
                     else      /* otherwise try to move selection */
                         MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, ITEM_NEXT );
@@ -2844 +2853 @@
     if (IsMenu(hMenu))
     {
+        if (ht == HTCAPTION) wFlags |= TPM_CAPTIONSYSMENU;
+        if (IsIconic(hWnd)) wFlags |= TPM_BOTTOMALIGN; //CB: todo: for minimized windows
+
         MENU_InitTracking( hWnd, hMenu, FALSE, wFlags );
         MENU_TrackMenu( hMenu, wFlags, pt.x, pt.y, hWnd,ht == 0, NULL );