summaryrefslogtreecommitdiff
path: root/sway/scratchpad.c
diff options
context:
space:
mode:
authorRyan Dwyer <[email protected]>2018-07-26 18:36:46 +1000
committerRyan Dwyer <[email protected]>2018-07-28 22:41:04 +1000
commit08cfba2192f5770d975c5fe70789a81aaee4dc7e (patch)
tree7f07e32020649ae5c049e8533f0cf040dc80e166 /sway/scratchpad.c
parenta2164c666197e983b2059647e31fd93491893c43 (diff)
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 (b14bd1b0b1536039e4f46fe94515c7c44e7afc61) 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.
Diffstat (limited to 'sway/scratchpad.c')
-rw-r--r--sway/scratchpad.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sway/scratchpad.c b/sway/scratchpad.c
index 64636c77..181d9b3b 100644
--- a/sway/scratchpad.c
+++ b/sway/scratchpad.c
@@ -72,11 +72,7 @@ static void scratchpad_show(struct sway_container *con) {
if (!wlr_box_contains_point(&workspace_box, center_lx, center_ly)) {
// Maybe resize it
if (con->width > ws->width || con->height > ws->height) {
- // TODO: Do this properly once we can float C_CONTAINERs
- if (con->type == C_VIEW) {
- view_init_floating(con->sway_view);
- arrange_windows(con);
- }
+ container_init_floating(con);
}
// Center it
@@ -85,6 +81,7 @@ static void scratchpad_show(struct sway_container *con) {
container_floating_move_to(con, new_lx, new_ly);
}
+ arrange_windows(ws);
seat_set_focus(seat, con);
container_set_dirty(con->parent);