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

Bug 1314251, close menulist on alt+up/down, r=ksteuber

Browse Source
This commit is contained in:
Neil Deakin 2016-11-17 09:56:43 -05:00
parent 74aa0c0079
commit 18dc1a098a
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/xul/nsXULPopupManager.cpp
View File

@ -2340,10 +2340,21 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode(
bool consume = (mPopups || mActiveMenuBar);
switch (keyCode) {
case nsIDOMKeyEvent::DOM_VK_LEFT:
case nsIDOMKeyEvent::DOM_VK_RIGHT:
case nsIDOMKeyEvent::DOM_VK_UP:
case nsIDOMKeyEvent::DOM_VK_DOWN:
#ifndef XP_MACOSX
// roll up the popup when alt+up/down are pressed within a menulist.
bool alt;
aKeyEvent->GetAltKey(&alt);
if (alt && aTopVisibleMenuItem && aTopVisibleMenuItem->Frame()->IsMenuList()) {
Rollup(0, false, nullptr, nullptr);
break;
}
MOZ_FALLTHROUGH;
#endif
case nsIDOMKeyEvent::DOM_VK_LEFT:
case nsIDOMKeyEvent::DOM_VK_RIGHT:
case nsIDOMKeyEvent::DOM_VK_HOME:
case nsIDOMKeyEvent::DOM_VK_END:
HandleKeyboardNavigation(keyCode);

14
toolkit/content/tests/chrome/test_menulist_keynav.xul
View File

@ -20,7 +20,7 @@
</menulist>
<button id="button2" label="Two"/>
<menulist id="list2">
<menupopup id="popup" onpopupshown="checkCursorNavigation();" onpopuphidden="done()">
<menupopup id="popup" onpopupshown="checkCursorNavigation();">
<menuitem id="b1" label="One"/>
<menuitem id="b2" label="Two" selected="true"/>
<menuitem id="b3" label="Three"/>
@ -230,7 +230,7 @@ function verifyPopupOnClose()
is(gModifiers, 2, "modifiers checked when set");
ok(!list.open, "list closed on enter press with modifiers");
list.removeEventListener("popuphidden", done, false);
list.removeEventListener("popuphidden", verifyPopupOnClose, false);
list = $("list2");
list.focus();
@ -268,11 +268,13 @@ function checkCursorNavigation()
is(list.menuBoxObject.activeChild,
document.getElementById(iswin || ismac ? "b4" : "b1"), "cursor down wrap while open");
list.open = false;
}
synthesizeKey("VK_UP", { altKey: true });
is(list.open, ismac, "alt+up closes popup");
if (ismac) {
list.open = false;
}
function done()
{
SimpleTest.finish();
}