aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-12-29 13:55:38 -0500
committerGitHub <noreply@github.com>2017-12-29 13:55:38 -0500
commitd85ad05fa857cd7d7af2c8e2c33616d7895e1955 (patch)
treeac05a0b7e47e4291b3d4eebb6a378317e5831c9a
parentc08c805ecd8f2000a35cdeae7b16244d0b3c0528 (diff)
parentd6cc6600d0e69d7ca84064e4ea94e89055a83a42 (diff)
Merge pull request #1544 from CedricCabessa/fix1056-swaylock-allow-popup-to-come-through
partial fix #1056
-rw-r--r--sway/handlers.c6
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: