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>
This commit is contained in:
Jonas Dreßler 2024-03-07 23:07:23 +01:00 committed by Florian Müllner
parent e1db7e368f
commit a64424864b

View File

@ -742,8 +742,7 @@ export function popModal(grab) {
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);