arrange windows

5 files changed, 11 insertions, 11 deletions

diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 4bfd1c45..137b3260 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -172,7 +172,7 @@ void arrange_layers(struct sway_output *output) {
 	if (memcmp(&usable_area_before,
 			&usable_area, sizeof(struct wlr_box)) != 0) {
 		wlr_log(L_DEBUG, "arrange");
-		container_arrange_windows(output->swayc, -1, -1);
+		arrange_windows(output->swayc, -1, -1);
 	}
 
 	// Arrange non-exlusive surfaces from top->bottom
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index fa1b0680..b463dfdc 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -264,7 +264,7 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) {
 static void handle_output_mode(struct wl_listener *listener, void *data) {
 	struct sway_output *output = wl_container_of(listener, output, mode);
 	arrange_layers(output);
-	container_arrange_windows(output->swayc, -1, -1);
+	arrange_windows(output->swayc, -1, -1);
 }
 
 void handle_new_output(struct wl_listener *listener, void *data) {
@@ -307,5 +307,5 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 	output->mode.notify = handle_output_mode;
 
 	arrange_layers(output);
-	container_arrange_windows(&root_container, -1, -1);
+	arrange_windows(&root_container, -1, -1);
 }
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index ac1c7f26..4d4d1ed7 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -77,7 +77,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
 	free(sway_surface->view);
 	free(sway_surface);
-	container_arrange_windows(parent, -1, -1);
+	arrange_windows(parent, -1, -1);
 }
 
 void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
@@ -136,6 +136,6 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	struct sway_container *cont = container_view_create(focus, sway_view);
 	sway_view->swayc = cont;
 
-	container_arrange_windows(cont->parent, -1, -1);
+	arrange_windows(cont->parent, -1, -1);
 	sway_input_manager_set_focus(input_manager, cont);
 }
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 616cb88f..09894f0e 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -86,7 +86,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 	struct sway_container *parent = container_view_destroy(sway_xdg_surface->view->swayc);
 	free(sway_xdg_surface->view);
 	free(sway_xdg_surface);
-	container_arrange_windows(parent, -1, -1);
+	arrange_windows(parent, -1, -1);
 }
 
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
@@ -140,7 +140,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	struct sway_container *cont = container_view_create(focus, sway_view);
 	sway_view->swayc = cont;
 
-	container_arrange_windows(cont->parent, -1, -1);
+	arrange_windows(cont->parent, -1, -1);
 
 	sway_input_manager_set_focus(input_manager, cont);
 }
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index fa1054f2..fd0bcaca 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -116,7 +116,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 
 	struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
 	if (parent) {
-		container_arrange_windows(parent, -1, -1);
+		arrange_windows(parent, -1, -1);
 	}
 
 	free(sway_surface->view);
@@ -134,7 +134,7 @@ static void handle_unmap_notify(struct wl_listener *listener, void *data) {
 	// take it out of the tree
 	struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
 	if (parent) {
-		container_arrange_windows(parent, -1, -1);
+		arrange_windows(parent, -1, -1);
 	}
 
 	sway_surface->view->swayc = NULL;
@@ -163,7 +163,7 @@ static void handle_map_notify(struct wl_listener *listener, void *data) {
 		struct sway_container *cont = container_view_create(parent, view);
 		view->swayc = cont;
 
-		container_arrange_windows(cont->parent, -1, -1);
+		arrange_windows(cont->parent, -1, -1);
 		sway_input_manager_set_focus(input_manager, cont);
 	}
 }
@@ -242,6 +242,6 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	struct sway_container *cont = container_view_create(focus, sway_view);
 	sway_view->swayc = cont;
 
-	container_arrange_windows(cont->parent, -1, -1);
+	arrange_windows(cont->parent, -1, -1);
 	sway_input_manager_set_focus(input_manager, cont);
 }