aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/container.c
diff options
context:
space:
mode:
authorLibravatar Pedro CĂ´rte-Real <pedro@pedrocr.net>2019-06-28 22:21:20 +0100
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-07-14 11:13:55 -0400
commite3a3917d3afb66fc8ba3eebb7aed603d3b7ce844 (patch)
tree6af979d7b1c1aeed9d88f168a9a0d1e1f7e663c0 /sway/tree/container.c
parentLayout correctly with several new windows (diff)
downloadsway-e3a3917d3afb66fc8ba3eebb7aed603d3b7ce844.tar.gz
sway-e3a3917d3afb66fc8ba3eebb7aed603d3b7ce844.tar.zst
sway-e3a3917d3afb66fc8ba3eebb7aed603d3b7ce844.zip
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/tree/container.c')
-rw-r--r--sway/tree/container.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 9046ae27..068dbb88 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -789,6 +789,8 @@ void container_set_floating(struct sway_container *container, bool enable) {
789 container->border = container->saved_border; 789 container->border = container->saved_border;
790 } 790 }
791 } 791 }
792 container->width_fraction = 0;
793 container->height_fraction = 0;
792 } 794 }
793 795
794 container_end_mouse_operation(container); 796 container_end_mouse_operation(container);
@@ -1022,9 +1024,9 @@ void container_fullscreen_disable(struct sway_container *con) {
1022 if (container_is_floating(con)) { 1024 if (container_is_floating(con)) {
1023 con->x = con->saved_x; 1025 con->x = con->saved_x;
1024 con->y = con->saved_y; 1026 con->y = con->saved_y;
1027 con->width = con->saved_width;
1028 con->height = con->saved_height;
1025 } 1029 }
1026 con->width = con->saved_width;
1027 con->height = con->saved_height;
1028 1030
1029 if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) { 1031 if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) {
1030 if (con->workspace) { 1032 if (con->workspace) {
@@ -1415,6 +1417,8 @@ struct sway_container *container_split(struct sway_container *child,
1415 struct sway_container *cont = container_create(NULL); 1417 struct sway_container *cont = container_create(NULL);
1416 cont->width = child->width; 1418 cont->width = child->width;
1417 cont->height = child->height; 1419 cont->height = child->height;
1420 cont->width_fraction = child->width_fraction;
1421 cont->height_fraction = child->height_fraction;
1418 cont->x = child->x; 1422 cont->x = child->x;
1419 cont->y = child->y; 1423 cont->y = child->y;
1420 cont->current_gaps = child->current_gaps; 1424 cont->current_gaps = child->current_gaps;