From e0d0e8f840271ab12533cb16c9a7ccba237adcb3 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Wed, 27 Jun 2018 17:53:13 +0100 Subject: Revert "Don't unmaximize floating views" This reverts commit 97672295ed50d1d6272876c4a3b6b5607cab05c6. --- sway/tree/container.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sway/tree/container.c') diff --git a/sway/tree/container.c b/sway/tree/container.c index af55a54e..d8d5c34a 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -943,6 +943,9 @@ void container_set_floating(struct sway_container *container, bool enable) { container_add_child(workspace, container); container->width = container->parent->width; container->height = container->parent->height; + if (container->type == C_VIEW) { + view_set_tiled(container->sway_view, true); + } container->is_sticky = false; container_reap_empty_recursive(workspace->sway_workspace->floating); } -- cgit v1.2.3 From f42bf0ad4abe185200b68ebce4848b80366cc474 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sat, 30 Jun 2018 11:11:06 +0100 Subject: container_at_view: don't offset the view by the window geometry Fixes floating window input offsets. As discussed on IRC with emersion, this shouldn't have been done in the first place. --- sway/tree/container.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'sway/tree/container.c') diff --git a/sway/tree/container.c b/sway/tree/container.c index d8d5c34a..2de0c7a8 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -507,21 +507,11 @@ static struct sway_container *container_at_view(struct sway_container *swayc, view_sx, view_sy, &_sx, &_sy); break; case SWAY_VIEW_XDG_SHELL_V6: - // the top left corner of the sway container is the - // coordinate of the top left corner of the window geometry - view_sx += sview->wlr_xdg_surface_v6->geometry.x; - view_sy += sview->wlr_xdg_surface_v6->geometry.y; - _surface = wlr_xdg_surface_v6_surface_at( sview->wlr_xdg_surface_v6, view_sx, view_sy, &_sx, &_sy); break; case SWAY_VIEW_XDG_SHELL: - // the top left corner of the sway container is the - // coordinate of the top left corner of the window geometry - view_sx += sview->wlr_xdg_surface->geometry.x; - view_sy += sview->wlr_xdg_surface->geometry.y; - _surface = wlr_xdg_surface_surface_at( sview->wlr_xdg_surface, view_sx, view_sy, &_sx, &_sy); -- cgit v1.2.3