diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-25 13:06:04 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 13:06:04 +1000 |
| commit | 4b9ad9c2382db9b2a9a224e9ebc60b6298843aa9 (patch) | |
| tree | f1ed7e866d4e34f5ef9b8f72ec8095369619aaa7 /sway/input | |
| parent | f51b9478f28143a4f1887711497ff131f26ab1c4 (diff) | |
| parent | e86d99acd655815781cd2e23877ce58ab5b24826 (diff) | |
Merge branch 'master' into commands
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/seat.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index caee37a6..997d7815 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -694,13 +694,11 @@ void seat_set_focus_warp(struct sway_seat *seat, // clean up unfocused empty workspace on new output if (new_output_last_ws) { - if (!workspace_is_visible(new_output_last_ws) - && workspace_is_empty(new_output_last_ws)) { - if (last_workspace == new_output_last_ws) { - last_focus = NULL; - last_workspace = NULL; - } - container_destroy(new_output_last_ws); + workspace_consider_destroy(new_output_last_ws); + if (new_output_last_ws->destroying && + last_workspace == new_output_last_ws) { + last_focus = NULL; + last_workspace = NULL; } } @@ -716,12 +714,9 @@ void seat_set_focus_warp(struct sway_seat *seat, if (notify && last_workspace != new_workspace) { ipc_event_workspace(last_workspace, new_workspace, "focus"); } - if (!workspace_is_visible(last_workspace) - && workspace_is_empty(last_workspace)) { - if (last_workspace == last_focus) { - last_focus = NULL; - } - container_destroy(last_workspace); + workspace_consider_destroy(last_workspace); + if (last_workspace->destroying && last_workspace == last_focus) { + last_focus = NULL; } } @@ -984,7 +979,7 @@ void seat_begin_resize_floating(struct sway_seat *seat, seat->op_resize_preserve_ratio = keyboard && (wlr_keyboard_get_modifiers(keyboard) & WLR_MODIFIER_SHIFT); seat->op_resize_edge = edge == WLR_EDGE_NONE ? - RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge; + WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT : edge; seat->op_button = button; seat->op_ref_lx = seat->cursor->cursor->x; seat->op_ref_ly = seat->cursor->cursor->y; |