From d74e33638c326319a693a4ccea8f9649ae8d0f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Thu, 7 Mar 2024 23:07:23 +0100
Subject: [PATCH] Revert "main: Only restore key focus on pop when modal actor
 is still focused"

This one caused a regression and now keys appear to get stuck while raising
the screenShield, so revert it. Hopefully we can fix the original problem in
a better way next cycle by tracking key focus changes internally in
ClutterGrab.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7446

This reverts commit 4d544d7b5614cd33bf60c1b610f8b81546955fbb.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3231>
(cherry picked from commit a64424864b61eeb7caf71fa1b4038893478c1d19)
---
 js/ui/main.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/ui/main.js b/js/ui/main.js
index 23e36aba5..4ba3faa8c 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -755,8 +755,7 @@ export function popModal(grab, timestamp) {
         if (record.prevFocus)
             record.prevFocus.disconnect(record.prevFocusDestroyId);
         actionMode = record.actionMode;
-        if (global.stage.key_focus === record.actor)
-            global.stage.set_key_focus(record.prevFocus);
+        global.stage.set_key_focus(record.prevFocus);
     } else {
         // If we have:
         //     global.stage.set_focus(a);