mirror of
https://github.com/swaywm/sway.git
synced 2025-11-26 06:59:59 -05:00
Allow containers to float
Things worth noting:
* When a fullscreen view unmaps, the check to unset fullscreen on the
workspace has been moved out of view_unmap and into container_destroy,
because containers can be fullscreen too
* The calls to `container_reap_empty_recursive(workspace)` have been
removed from `container_set_floating`. That function reaps upwards so it
wouldn't do anything. I'm probably the one who originally added it...
* My fix (b14bd1b0b1) for the tabbed child
crash has a side effect where when you close a floating container, focus
is not given to the tiled container again. I've removed my fix and
removed the call to `send_cursor_motion` from `seat_set_focus_warp`. We
should consider calling it from somewhere earlier in the call stack.
This commit is contained in:
parent
a2164c6661
commit
08cfba2192
11 changed files with 126 additions and 86 deletions
|
|
@ -598,7 +598,10 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
|
|||
seat_set_focus_layer(cursor->seat, layer);
|
||||
}
|
||||
seat_pointer_notify_button(cursor->seat, time_msec, button, state);
|
||||
} else if (cont && container_is_floating(cont)) {
|
||||
} else if (cont && container_is_floating_or_child(cont)) {
|
||||
while (cont->parent->layout != L_FLOATING) {
|
||||
cont = cont->parent;
|
||||
}
|
||||
dispatch_cursor_button_floating(cursor, time_msec, button, state,
|
||||
surface, sx, sy, cont);
|
||||
} else if (surface && cont && cont->type != C_VIEW) {
|
||||
|
|
|
|||
|
|
@ -184,7 +184,6 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
|
|||
bool set_focus =
|
||||
focus != NULL &&
|
||||
(focus == con || container_has_child(con, focus)) &&
|
||||
con->parent && con->parent->children->length > 1 &&
|
||||
con->type != C_WORKSPACE;
|
||||
|
||||
seat_container_destroy(seat_con);
|
||||
|
|
@ -754,10 +753,6 @@ void seat_set_focus_warp(struct sway_seat *seat,
|
|||
}
|
||||
}
|
||||
|
||||
if (last_focus != NULL) {
|
||||
cursor_send_pointer_motion(seat->cursor, 0, true);
|
||||
}
|
||||
|
||||
seat->has_focus = (container != NULL);
|
||||
|
||||
update_debug_tree();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue