Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing more keyboard navigation glitches in XP menus.

Browse Source
This commit is contained in:
hyatt%netscape.com 1999-07-26 04:38:28 +00:00
parent 10ddce94f7
commit 932172fb0b
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/xul/base/src/nsMenuFrame.cpp
View File

@ -243,8 +243,12 @@ nsMenuFrame::HandleEvent(nsIPresContext& aPresContext,
if (isActive) cancel = PR_FALSE;
}
if (cancel)
mMenuParent->SetCurrentMenuItem(nsnull);
if (cancel) {
if (IsMenu() && !isMenuBar && mMenuOpen) {
// Submenus don't get closed up.
}
else mMenuParent->SetCurrentMenuItem(nsnull);
}
}
}
else if (aEvent->message == NS_MOUSE_MOVE && mMenuParent) {
@ -480,14 +484,19 @@ void
nsMenuFrame::Notify(nsITimer* aTimer)
{
// Our timer has fired.
if (!mMenuOpen && mMenuParent) {
nsAutoString active = "";
mContent->GetAttribute(kNameSpaceID_None, nsXULAtoms::menuactive, active);
if (active == "true") {
// We're still the active menu.
OpenMenu(PR_TRUE);
if (aTimer == mOpenTimer.get()) {
if (!mMenuOpen && mMenuParent) {
nsAutoString active = "";
mContent->GetAttribute(kNameSpaceID_None, nsXULAtoms::menuactive, active);
if (active == "true") {
// We're still the active menu.
OpenMenu(PR_TRUE);
}
}
mOpenTimer->Cancel();
mOpenTimer = nsnull;
}
mOpenTimer = nsnull;
}

13
layout/xul/base/src/nsMenuPopupFrame.cpp
View File

@ -486,11 +486,16 @@ nsMenuPopupFrame::KeyboardNavigation(PRUint32 aDirection, PRBool& aHandledFlag)
aHandledFlag = PR_TRUE;
}
else if (aDirection == NS_VK_LEFT && mCurrentMenu &&
menuFrame->IsMenu()) {
// Close it up.
else if (mCurrentMenu && menuFrame->IsMenu() && menuFrame->IsOpen()) {
aHandledFlag = PR_TRUE;
menuFrame->OpenMenu(PR_FALSE);
if (aDirection == NS_VK_LEFT) {
// Close it up.
menuFrame->OpenMenu(PR_FALSE);
}
else if (aDirection == NS_VK_RIGHT) {
// Select the first item.
menuFrame->SelectFirstItem();
}
}
}