Merge pull request #1544 from CedricCabessa/fix1056-swaylock-allow-popup-to-come-through

partial fix #1056

1 files changed, 4 insertions, 2 deletions

diff --git a/sway/handlers.c b/sway/handlers.c
index 33e75d6b..f4d447eb 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -449,8 +449,10 @@ static bool handle_view_created(wlc_handle handle) {
 
         // Modals, get focus, popups do not
         case WLC_BIT_MODAL:
-                wlc_view_focus(handle);
-                wlc_view_bring_to_front(handle);
+                if (!desktop_shell.is_locked) {
+                        wlc_view_focus(handle);
+                        wlc_view_bring_to_front(handle);
+                }
                 newview = new_floating_view(handle);
                 /* fallthrough */
         case WLC_BIT_POPUP: