From 542c81ab1f444bdd4156ce10ddfbf879fec44d05 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 04 2020 18:29:46 +0000
Subject: import gnome-shell-3.32.2-20.el8


---

diff --git a/SOURCES/0001-popupMenu-Handle-keypress-if-numlock-is-enabled.patch b/SOURCES/0001-popupMenu-Handle-keypress-if-numlock-is-enabled.patch
new file mode 100644
index 0000000..e6fed23
--- /dev/null
+++ b/SOURCES/0001-popupMenu-Handle-keypress-if-numlock-is-enabled.patch
@@ -0,0 +1,36 @@
+From fb0a9a60ab8f1c0dd96e789969ab9b6e48a9fce4 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+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 6de081ce81..9835face19 100644
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -801,9 +801,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)
+-- 
+2.26.2
+
diff --git a/SPECS/gnome-shell.spec b/SPECS/gnome-shell.spec
index 3687878..2ee05b4 100644
--- a/SPECS/gnome-shell.spec
+++ b/SPECS/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.32.2
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -46,6 +46,7 @@ Patch48: 0001-padOsd-Re-query-action-labels-after-mode-switches.patch
 Patch49: 0001-Do-not-change-Wacom-LEDs-through-g-s-d.patch
 Patch50: 0001-st-texture-cache-Cancel-pending-requests-on-icon-the.patch
 Patch51: introspect-backports.patch
+Patch52: 0001-popupMenu-Handle-keypress-if-numlock-is-enabled.patch
 
 # Backport JS invalid access warnings (#1651894, #1663171, #1642482, #1637622)
 Patch54: fix-invalid-access-warnings.patch
@@ -238,6 +239,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Jul 30 2020 Florian Müllner <fmuellner@redhat.com> - 3.32.2-20
+- Fix popupMenu keynav when NumLock is active
+  Resolves: #1840080
+
 * Mon Jun 15 2020 Florian Müllner <fmuellner@redhat.com> - 3.32.2-19
 - Fix last backport
   Resolves: #1847051