user32: Ensure VK_UP displays the popup menu for the selected item if
the popup menu is not visible
This commit is contained in:
parent
ec2cb1871c
commit
24dc3de4c9
|
@ -3053,19 +3053,19 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
|
||||||
case VK_END:
|
case VK_END:
|
||||||
MENU_SelectItem( mt.hOwnerWnd, mt.hCurrentMenu,
|
MENU_SelectItem( mt.hOwnerWnd, mt.hCurrentMenu,
|
||||||
NO_SELECTED_ITEM, FALSE, 0 );
|
NO_SELECTED_ITEM, FALSE, 0 );
|
||||||
/* fall through */
|
|
||||||
case VK_UP:
|
|
||||||
MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu,
|
MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu,
|
||||||
(msg.wParam == VK_HOME)? ITEM_NEXT : ITEM_PREV );
|
(msg.wParam == VK_HOME)? ITEM_NEXT : ITEM_PREV );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case VK_UP:
|
||||||
case VK_DOWN: /* If on menu bar, pull-down the menu */
|
case VK_DOWN: /* If on menu bar, pull-down the menu */
|
||||||
|
|
||||||
menu = MENU_GetMenu( mt.hCurrentMenu );
|
menu = MENU_GetMenu( mt.hCurrentMenu );
|
||||||
if (!(menu->wFlags & MF_POPUP))
|
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);
|
||||||
else /* otherwise try to move selection */
|
else /* otherwise try to move selection */
|
||||||
MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, ITEM_NEXT );
|
MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu,
|
||||||
|
(msg.wParam == VK_UP)? ITEM_PREV : ITEM_NEXT );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VK_LEFT:
|
case VK_LEFT:
|
||||||
|
|
Loading…
Reference in New Issue