Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 52007 Menu accelerators don't work if alt held down patch by jruderman@hmc.edu r=akkana sr=kin a=asa

Browse Source
This commit is contained in:
timeless%mac.com 2002-09-06 03:15:55 +00:00
parent b1087a4af6
commit a4f01e457f
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
layout/xul/base/src/nsMenuListener.cpp
View File

@ -111,33 +111,16 @@ nsMenuListener::KeyDown(nsIDOMEvent* aKeyEvent)
{
PRInt32 menuAccessKey = -1;
// If the key just pressed is the access key (usually Alt),
// dismiss and unfocus the menu.
nsMenuBarListener::GetMenuAccessKey(&menuAccessKey);
if (menuAccessKey) {
PRUint32 theChar;
nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aKeyEvent);
keyEvent->GetKeyCode(&theChar);
PRBool access = PR_FALSE;
PRBool accessKeyDown = PR_FALSE;
switch (menuAccessKey)
{
case nsIDOMKeyEvent::DOM_VK_CONTROL:
keyEvent->GetCtrlKey(&access);
break;
case nsIDOMKeyEvent::DOM_VK_ALT:
keyEvent->GetAltKey(&access);
break;
case nsIDOMKeyEvent::DOM_VK_META:
keyEvent->GetMetaKey(&access);
break;
default:
access = 0;
}
if (theChar == nsIDOMKeyEvent::DOM_VK_TAB && accessKeyDown) {
accessKeyDown = PR_FALSE;
}
if (theChar == (PRUint32)menuAccessKey || access) {
if (theChar == (PRUint32)menuAccessKey) {
// No other modifiers can be down.
// Especially CTRL. CTRL+ALT == AltGR, and
// we'll fuck up on non-US enhanced 102-key
@ -155,14 +138,16 @@ nsMenuListener::KeyDown(nsIDOMEvent* aKeyEvent)
if (menuAccessKey != nsIDOMKeyEvent::DOM_VK_META)
keyEvent->GetMetaKey(&meta);
if (!(ctrl || alt || shift || meta)) {
// The access key just went down by itself. Track this.
accessKeyDown = PR_TRUE;
// The access key just went down and no other
// modifiers are already down.
mMenuParent->DismissChain();
}
}
if (accessKeyDown)
mMenuParent->DismissChain();
}
// Since a menu was open, eat the event to keep other event
// listeners from becoming confused.
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
if (nsevent) {