diff options
author | Pedro CĂ´rte-Real <pedro@pedrocr.net> | 2019-06-28 22:21:20 +0100 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-07-14 11:13:55 -0400 |
commit | e3a3917d3afb66fc8ba3eebb7aed603d3b7ce844 (patch) | |
tree | 6af979d7b1c1aeed9d88f168a9a0d1e1f7e663c0 /sway/commands/swap.c | |
parent | 1312b5bb9faf7ab50c3024fc4f05b58481bf318c (diff) |
Layout tiled using a width/height fraction
Instead of using container->width/height as both the input and output
of the layout calculation have container->width_fraction/height_fraction
as the share of the parent this container occupies and calculate the
layout based on that. That way the container arrangement can always be
recalculated even if width/height have been altered by things like
fullscreen.
To do this several parts are reworked:
- The vertical and horizontal arrangement code is ajusted to work with
fractions instead of directly with width/height
- The resize code is then changed to manipulate the fractions when
working on tiled containers.
- Finally the places that manipulated width/height are adjusted to
match. The adjusted parts are container split, swap, and the input
seat code.
It's possible that some parts of the code are now adjusting width and
height only for those to be immediately recalculated. That's harmless
and since non-tiled containers are still sized with width/height
directly it may avoid breaking other corner cases.
Fixes #3547
Fixes #4297
Diffstat (limited to 'sway/commands/swap.c')
-rw-r--r-- | sway/commands/swap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sway/commands/swap.c b/sway/commands/swap.c index f27aa7ed..a4a4108d 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c @@ -20,6 +20,8 @@ static void swap_places(struct sway_container *con1, temp->y = con1->y; temp->width = con1->width; temp->height = con1->height; + temp->width_fraction = con1->width_fraction; + temp->height_fraction = con1->height_fraction; temp->parent = con1->parent; temp->workspace = con1->workspace; @@ -27,11 +29,15 @@ static void swap_places(struct sway_container *con1, con1->y = con2->y; con1->width = con2->width; con1->height = con2->height; + con1->width_fraction = con2->width_fraction; + con1->height_fraction = con2->height_fraction; con2->x = temp->x; con2->y = temp->y; con2->width = temp->width; con2->height = temp->height; + con2->width_fraction = temp->width_fraction; + con2->height_fraction = temp->height_fraction; int temp_index = container_sibling_index(con1); if (con2->parent) { |