From f156a25e64736909fd0f33942a0a4dba202c431c Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 4 Jul 2018 20:10:47 +1000 Subject: [PATCH 1/2] Only call view_set_tiled when switching floating mode Otherwise it repeatedly sets the view's border to the config's default. --- sway/tree/container.c | 1 + sway/tree/view.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sway/tree/container.c b/sway/tree/container.c index 6f6137c4a..d19c857cc 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -935,6 +935,7 @@ void container_set_floating(struct sway_container *container, bool enable) { container_add_child(workspace->sway_workspace->floating, container); if (container->type == C_VIEW) { view_init_floating(container->sway_view); + view_set_tiled(container->sway_view, true); } seat_set_focus(seat, seat_get_focus_inactive(seat, container)); container_reap_empty_recursive(workspace); diff --git a/sway/tree/view.c b/sway/tree/view.c index 06e9edc50..c2826f6f7 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -164,9 +164,6 @@ void view_init_floating(struct sway_view *view) { view->border_left = view->border_right = true; container_set_geometry_from_floating_view(view->swayc); - - // Don't maximize floating windows - view_set_tiled(view, false); } void view_autoconfigure(struct sway_view *view) { @@ -278,7 +275,6 @@ void view_autoconfigure(struct sway_view *view) { view->y = y; view->width = width; view->height = height; - view_set_tiled(view, true); } void view_set_activated(struct sway_view *view, bool activated) { From 4cb6c368a7421c0f99c796214696f6b5b3ee95fa Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 4 Jul 2018 20:33:38 +1000 Subject: [PATCH 2/2] Fix boolean --- sway/tree/container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/tree/container.c b/sway/tree/container.c index d19c857cc..3614d4e73 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -935,7 +935,7 @@ void container_set_floating(struct sway_container *container, bool enable) { container_add_child(workspace->sway_workspace->floating, container); if (container->type == C_VIEW) { view_init_floating(container->sway_view); - view_set_tiled(container->sway_view, true); + view_set_tiled(container->sway_view, false); } seat_set_focus(seat, seat_get_focus_inactive(seat, container)); container_reap_empty_recursive(workspace);