aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/tree/container.h
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-07 09:30:27 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-08 08:48:20 +1000
commita0649190deaaf093112e99881c25ff550f07e96b (patch)
tree922fc56dad707ceeebaf6ea3364751e51d764407 /include/sway/tree/container.h
parentImplement move to workspace on a floating container (diff)
downloadsway-a0649190deaaf093112e99881c25ff550f07e96b.tar.gz
sway-a0649190deaaf093112e99881c25ff550f07e96b.tar.zst
sway-a0649190deaaf093112e99881c25ff550f07e96b.zip
Fix edge cases when moving floating container to new workspace
* Removes container_floating_move_to_container, instead opting to put that logic in container_move_to * In the seat code, focusing a floating view now updates the pending state only and lets the next transaction carry it over to the current state. This is required, otherwise it would crash. * When unfullscreening a floating container, an output check is now done to see if it should center it.
Diffstat (limited to 'include/sway/tree/container.h')
-rw-r--r--include/sway/tree/container.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index d82db89c..4d0e6003 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -323,6 +323,12 @@ void container_floating_translate(struct sway_container *con,
323 double x_amount, double y_amount); 323 double x_amount, double y_amount);
324 324
325/** 325/**
326 * Choose an output for the floating container's new position.
327 */
328struct sway_container *container_floating_find_output(
329 struct sway_container *con);
330
331/**
326 * Move a floating container to a new layout-local position. 332 * Move a floating container to a new layout-local position.
327 */ 333 */
328void container_floating_move_to(struct sway_container *con, 334void container_floating_move_to(struct sway_container *con,
@@ -333,9 +339,6 @@ void container_floating_move_to(struct sway_container *con,
333 */ 339 */
334void container_floating_move_to_center(struct sway_container *con); 340void container_floating_move_to_center(struct sway_container *con);
335 341
336void container_floating_move_to_container(struct sway_container *container,
337 struct sway_container *destination);
338
339/** 342/**
340 * Mark a container as dirty if it isn't already. Dirty containers will be 343 * Mark a container as dirty if it isn't already. Dirty containers will be
341 * included in the next transaction then unmarked as dirty. 344 * included in the next transaction then unmarked as dirty.