diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-03-18 18:04:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-18 18:04:02 -0400 |
commit | 0fa8b5abfbddbdacfb9330167ae09bd4027f9654 (patch) | |
tree | 0d242ebd0ca87cba9b338d769ec30b6e1cdc4729 /sway/handlers.c | |
parent | 856984a7f62b7e02220a5748275e2a86354d4822 (diff) | |
parent | 2d46fc5602e2c50be669e1911077028d0453d77a (diff) |
Merge pull request #1126 from zandrmartin/prevent-fullscreen-focus-stealing
prevent fullscreen focus thievery
Diffstat (limited to 'sway/handlers.c')
-rw-r--r-- | sway/handlers.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 5862c2b9..b61c0a19 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -310,7 +310,7 @@ static void positioner_place_window(wlc_handle handle) { /* default */ } else { geo.origin.x -= geo.size.w / 2; - } + } sway_log(L_DEBUG, "xdg-positioner: placing window %" PRIuPTR " " "sized (%u,%u) offset by (%d,%d), " @@ -605,10 +605,13 @@ static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit s sway_log(L_DEBUG, "setting view %" PRIuPTR " %s, fullscreen %d", view, c->name, toggle); arrange_windows(c->parent, -1, -1); // Set it as focused window for that workspace if its going fullscreen + swayc_t *ws = swayc_parent_by_type(c, C_WORKSPACE); if (toggle) { - swayc_t *ws = swayc_parent_by_type(c, C_WORKSPACE); // Set ws focus to c set_focused_container_for(ws, c); + ws->fullscreen = c; + } else { + ws->fullscreen = NULL; } } break; |