From 167c2e1aa99aa8011e169b0fb61c47953cc9a5f6 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 28 Apr 2018 11:26:14 +1000 Subject: Refactor arrange_windows() Replaces arrange_windows() with arrange_root(), arrange_output(), arrange_workspace() and arrange_children_of(). Also makes fullscreen views save and restore their dimensions, which allows it to preserve any custom resize and is also a requirement for floating views once they are implemented. --- sway/commands/layout.c | 4 ++-- sway/commands/reload.c | 4 ++-- sway/commands/resize.c | 4 ++-- sway/commands/split.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sway/commands') diff --git a/sway/commands/layout.c b/sway/commands/layout.c index ca45a6c8..bb36bb18 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -1,8 +1,8 @@ #include #include #include "sway/commands.h" +#include "sway/tree/arrange.h" #include "sway/tree/container.h" -#include "sway/tree/layout.h" #include "log.h" struct cmd_results *cmd_layout(int argc, char **argv) { @@ -48,7 +48,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) { } } - arrange_windows(parent, parent->width, parent->height); + arrange_children_of(parent); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } diff --git a/sway/commands/reload.c b/sway/commands/reload.c index 5bca6cde..092dd46f 100644 --- a/sway/commands/reload.c +++ b/sway/commands/reload.c @@ -1,6 +1,6 @@ #include "sway/commands.h" #include "sway/config.h" -#include "sway/tree/layout.h" +#include "sway/tree/arrange.h" struct cmd_results *cmd_reload(int argc, char **argv) { struct cmd_results *error = NULL; @@ -12,6 +12,6 @@ struct cmd_results *cmd_reload(int argc, char **argv) { } load_swaybars(); - arrange_windows(&root_container, -1, -1); + arrange_root(); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 93c1fe7d..d1f9e019 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c @@ -6,7 +6,7 @@ #include #include #include "sway/commands.h" -#include "sway/tree/layout.h" +#include "sway/tree/arrange.h" #include "log.h" static const int MIN_SANE_W = 100, MIN_SANE_H = 60; @@ -182,7 +182,7 @@ static void resize_tiled(int amount, enum resize_axis axis) { } } - arrange_windows(parent->parent, -1, -1); + arrange_children_of(parent->parent); } static void resize(int amount, enum resize_axis axis, enum resize_unit unit) { diff --git a/sway/commands/split.c b/sway/commands/split.c index 130ed31f..0a61ac8d 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c @@ -1,8 +1,8 @@ #include #include #include "sway/commands.h" +#include "sway/tree/arrange.h" #include "sway/tree/container.h" -#include "sway/tree/layout.h" #include "sway/tree/view.h" #include "sway/input/input-manager.h" #include "sway/input/seat.h" @@ -12,7 +12,7 @@ static struct cmd_results *do_split(int layout) { struct sway_container *con = config->handler_context.current_container; struct sway_container *parent = container_split(con, layout); container_create_notify(parent); - arrange_windows(parent, -1, -1); + arrange_children_of(parent); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } -- cgit v1.2.3