diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-26 18:36:46 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-28 22:41:04 +1000 |
| commit | 08cfba2192f5770d975c5fe70789a81aaee4dc7e (patch) | |
| tree | 7f07e32020649ae5c049e8533f0cf040dc80e166 /include/sway/tree | |
| parent | a2164c666197e983b2059647e31fd93491893c43 (diff) | |
| download | sway-08cfba2192f5770d975c5fe70789a81aaee4dc7e.tar.xz | |
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 'include/sway/tree')
| -rw-r--r-- | include/sway/tree/container.h | 11 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index c584cd92..d91b3bf1 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -297,6 +297,11 @@ void container_notify_subtree_changed(struct sway_container *container); */ size_t container_titlebar_height(void); +/** + * Resize and center the container in its workspace. + */ +void container_init_floating(struct sway_container *container); + void container_set_floating(struct sway_container *container, bool enable); void container_set_geometry_from_floating_view(struct sway_container *con); @@ -341,6 +346,12 @@ void container_end_mouse_operation(struct sway_container *container); void container_set_fullscreen(struct sway_container *container, bool enable); /** + * Return true if the container is floating, or a child of a floating split + * container. + */ +bool container_is_floating_or_child(struct sway_container *container); + +/** * Return true if the container is fullscreen, or a child of a fullscreen split * container. */ diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 7086314f..0152ed55 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -235,11 +235,6 @@ uint32_t view_configure(struct sway_view *view, double lx, double ly, int width, int height); /** - * Center the view in its workspace and build the swayc decorations around it. - */ -void view_init_floating(struct sway_view *view); - -/** * Configure the view's position and size based on the swayc's position and * size, taking borders into consideration. */ |