aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-07-04 20:10:47 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-07-04 20:10:47 +1000
commitf156a25e64736909fd0f33942a0a4dba202c431c (patch)
treea7821c3dc0f035a85f9d7d21795ea9bc6ce99b28 /sway
parent4afa18a0c03b37d92557ce9a1b6822d2acac13f7 (diff)
Only call view_set_tiled when switching floating mode
Otherwise it repeatedly sets the view's border to the config's default.
Diffstat (limited to 'sway')
-rw-r--r--sway/tree/container.c1
-rw-r--r--sway/tree/view.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 6f6137c4..d19c857c 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 06e9edc5..c2826f6f 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) {