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

Timestamp:

Jan 15, 2000, 3:18:18 PM (26 years ago)

Author:

cbratschi

Message:

several nc changes

File:

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

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.9 2000-01-13 20:11:36 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.10 2000-01-15 14:18:16 cbratschi Exp $*/
 /*
  * Menu functions
@@ -1029 +1029 @@
     //debug_print_menuitem("MENU_DrawMenuItem: ", lpitem, "");
 
-    if (lpitem->fType & MF_SYSMENU)
-    {
-        if( !IsIconic(hwnd) )
-        {
-          Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-
-          if (win32wnd) win32wnd->DrawSysButton(hdc,lpitem->fState & (MF_HILITE | MF_MOUSESELECT));
-        }
-
-        return;
-    }
+    if (lpitem->fType & MF_SYSMENU) return;
 
     if (lpitem->fType & MF_OWNERDRAW)
@@ -1074 +1064 @@
 
     if ((lpitem->fState & MF_HILITE) && !(IS_BITMAP_ITEM(lpitem->fType)))
-        if (menuBar)
-            DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
-        else
             FillRect( hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
     else {
@@ -1385 +1372 @@
     }
 
-    FillRect(hDC, lprect, GetSysColorBrush(COLOR_MENU) );
-
-    SelectObject( hDC, GetSysColorPen(COLOR_3DFACE));
-    MoveToEx( hDC, lprect->left, lprect->bottom,NULL);
-    LineTo( hDC, lprect->right, lprect->bottom );
+    HDC memDC;
+    HBITMAP memBmp,oldBmp;
+    RECT r;
+    HFONT oldMemFont;
+
+    memDC = CreateCompatibleDC(hDC);
+    r = *lprect;
+    r.right -= r.left;
+    r.bottom -= r.top;
+    r.left = r.top = 0;
+    memBmp = CreateCompatibleBitmap(hDC,r.right,r.bottom+1);
+    oldBmp = SelectObject(memDC,memBmp);
+    oldMemFont = SelectObject(memDC,hMenuFont);
+
+    FillRect(memDC,&r,GetSysColorBrush(COLOR_MENU));
+
+    SelectObject(memDC,GetSysColorPen(COLOR_3DFACE));
+    MoveToEx(memDC,r.left,r.bottom,NULL);
+    LineTo(memDC,r.right,r.bottom);
 
     if (lppop->nItems == 0)
     {
-        retvalue = GetSystemMetrics(SM_CYMENU);
-        goto END;
-    }
-
-    for (i = 0; i < lppop->nItems; i++)
-    {
+      retvalue = GetSystemMetrics(SM_CYMENU);
+    } else
+    {
+      for (i = 0; i < lppop->nItems; i++)
+      {
+        OffsetRect(&lppop->items[i].rect,-lprect->left,-lprect->top);
         MENU_DrawMenuItem( hwnd,getMenu(hwnd), GetWindow(hwnd,GW_OWNER),
-                         hDC, &lppop->items[i], lppop->Height, TRUE, ODA_DRAWENTIRE );
-    }
-    retvalue = lppop->Height;
+                         memDC, &lppop->items[i], lppop->Height, TRUE, ODA_DRAWENTIRE );
+        OffsetRect(&lppop->items[i].rect,lprect->left,lprect->top);
+      }
+      retvalue = lppop->Height;
+    }
+
+    BitBlt(hDC,lprect->left,lprect->top,lprect->right-lprect->left,lprect->bottom-lprect->top+1,memDC,0,0,SRCCOPY);
+    SelectObject(memDC,oldBmp);
+    if (oldMemFont) SelectObject(memDC,oldMemFont);
+    DeleteObject(memBmp);
+    DeleteDC(memDC);
 
 END:
@@ -2103 +2112 @@
  * Walks menu chain trying to find a menu pt maps to.
  */
-static HMENU MENU_PtMenu( HMENU hMenu, POINT pt )
+static HMENU MENU_PtMenu(HMENU hMenu,POINT pt,BOOL inMenuBar)
 {
    POPUPMENU *menu = (POPUPMENU*)hMenu;
@@ -2112 +2121 @@
           (menu->items[ht].fType & MF_POPUP) &&
           (menu->items[ht].fState & MF_MOUSESELECT))
-        ? (UINT) MENU_PtMenu(menu->items[ht].hSubMenu, pt) : 0;
+        ? (UINT) MENU_PtMenu(menu->items[ht].hSubMenu,pt,inMenuBar) : 0;
 
    if( !ht )    /* check the current window (avoiding WM_HITTEST) */
@@ -2126 +2135 @@
         else
         {
-            ht = ( ht == HTSYSMENU ) ? (UINT)(getSysMenu(menu->hWnd))
-                 : ( ht == HTMENU ) ? (UINT)(getMenu(menu->hWnd)) : 0;
+            ht = ((ht == HTSYSMENU) && !inMenuBar) ? (UINT)(getSysMenu(menu->hWnd))
+                 : ((ht == HTMENU) && inMenuBar) ? (UINT)(getMenu(menu->hWnd)) : 0;
         }
    }
@@ -2402 +2411 @@
         if( hNewWnd != pmt->hOwnerWnd )
         {
-            ReleaseCapture(); 
+            ReleaseCapture();
             pmt->hOwnerWnd = hNewWnd;
-            SetCapture(pmt->hOwnerWnd); //SvL: Don't know if this is good enough
+            SetCapture(pmt->hOwnerWnd); //SvL: Don't know if this is good enough
             //EVENT_Capture( pmt->hOwnerWnd, HTMENU ); //CB: todo
         }
@@ -2568 +2577 @@
  * Menu tracking code.
  */
-static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
-                              HWND hwnd, const RECT *lprect )
+static INT MENU_TrackMenu(HMENU hmenu,UINT wFlags,INT x,INT y,HWND hwnd,BOOL inMenuBar,const RECT *lprect)
 {
     MSG msg;
@@ -2606 +2614 @@
          * clear that menu loop is not over yet. */
 //        if (!GetMessageA(&msg,msg.hwnd,0,0)) break;
-        //SvL: Getting messages for only the menu delays background paints (i.e. VPBuddy logo)
+        //SvL: Getting messages for only the menu delays background paints (i.e. VPBuddy logo)
         if (!GetMessageA(&msg,0,0,0)) break;
         TranslateMessage( &msg );
@@ -2619 +2627 @@
             /* Find a menu for this mouse event */
             POINT pt = msg.pt;
-            hmenu = MENU_PtMenu( mt.hTopMenu, pt );
+
+            hmenu = MENU_PtMenu(mt.hTopMenu,pt,inMenuBar);
 
             switch(msg.message)
@@ -2828 +2837 @@
 void MENU_TrackMouseMenuBar( HWND hWnd, INT ht, POINT pt )
 {
-    HMENU hMenu = (ht == HTSYSMENU) ? getSysMenu(hWnd):getMenu(hWnd);
+    HMENU hMenu = (ht == 0) ? getMenu(hWnd):getSysMenu(hWnd);
     UINT wFlags = TPM_ENTERIDLEEX | TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON;
 
@@ -2836 +2845 @@
     {
         MENU_InitTracking( hWnd, hMenu, FALSE, wFlags );
-        MENU_TrackMenu( hMenu, wFlags, pt.x, pt.y, hWnd, NULL );
+        MENU_TrackMenu( hMenu, wFlags, pt.x, pt.y, hWnd,ht == 0, NULL );
         MENU_ExitTracking(hWnd);
     }
@@ -2895 +2904 @@
                 PostMessageA( hWnd, WM_KEYDOWN, VK_DOWN, 0L );
 
-            MENU_TrackMenu( hTrackMenu, wFlags, 0, 0, hWnd, NULL );
+            MENU_TrackMenu( hTrackMenu, wFlags, 0, 0, hWnd,TRUE, NULL );
         }
 
@@ -2924 +2933 @@
 
     if (MENU_ShowPopup( hWnd, hMenu, 0, x, y, 0, 0 ))
-        ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpRect );
+        ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd,FALSE, lpRect );
     MENU_ExitTracking(hWnd);
 
@@ -3311 +3320 @@
 
     if (IS_STRING_ITEM(flags) && str)
-        dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
+        dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
     //    TRACE("hMenu %04x, pos %d, flags %08x, "
     //                  "id %04x, str '%s'\n",
     //                  hMenu, pos, flags, id, str );
     else // TRACE("hMenu %04x, pos %d, flags %08x, "
-        dprintf(("USER32: InsertMenuA %x %d %x %d %x", hMenu, pos, flags, id, str));
+        dprintf(("USER32: InsertMenuA %x %d %x %d %x", hMenu, pos, flags, id, str));
     //                   "id %04x, str %08lx (not a string)\n",
     //                   hMenu, pos, flags, id, (DWORD)str );
@@ -3445 +3454 @@
     if (IS_STRING_ITEM(flags))
     {
-        dprintf(("USER32: ModifyMenuA, %x %d %x %d %s", hMenu, pos, flags, id, str));
+        dprintf(("USER32: ModifyMenuA, %x %d %x %d %s", hMenu, pos, flags, id, str));
         //TRACE("%04x %d %04x %04x '%s'\n",
         //              hMenu, pos, flags, id, str ? str : "#NULL#" );
@@ -3452 +3461 @@
     else
     {
-        dprintf(("USER32: ModifyMenuA, %x %d %x %d %x", hMenu, pos, flags, id, str));
+        dprintf(("USER32: ModifyMenuA, %x %d %x %d %x", hMenu, pos, flags, id, str));
         //TRACE("%04x %d %04x %04x %08lx\n",
         //              hMenu, pos, flags, id, (DWORD)str );