From 1e87315554baa6a0f8e4fa308191efd7b2040dcc Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 21 Jul 2020 16:33:04 +0200 Subject: [PATCH] popupMenu: Handle keypress if numlock is enabled On Wayland, navigating menus with the keyboard would not open drop-down menus when NumLock is enabled. That's old issue (gnome-shell#550) that was not completely fixed with commit 88556226 because the lock mask needs to be filtered out in _onKeyPress() as well. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/550 --- js/ui/popupMenu.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js index ad827ac5b..222dbe9c4 100644 --- a/js/ui/popupMenu.js +++ b/js/ui/popupMenu.js @@ -881,9 +881,10 @@ var PopupMenu = class extends PopupMenuBase { let state = event.get_state(); - // if user has a modifier down (except capslock) + // if user has a modifier down (except capslock and numlock) // then don't handle the key press here state &= ~Clutter.ModifierType.LOCK_MASK; + state &= ~Clutter.ModifierType.MOD2_MASK; state &= Clutter.ModifierType.MODIFIER_MASK; if (state)