1 files changed, 6 insertions, 14 deletions

diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 46582204..1ed45a6b 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -406,27 +406,19 @@ static void handle_map(struct wl_listener *listener, void *data) {
                 view->natural_height = view->wlr_xdg_surface->surface->current.height;
         }
 
-        view_map(view, view->wlr_xdg_surface->surface);
+        bool csd = false;
 
         if (!view->xdg_decoration) {
                 struct sway_server_decoration *deco =
-                        decoration_from_surface(xdg_surface->surface);
-                bool csd = !deco || deco->wlr_server_decoration->mode ==
+                                decoration_from_surface(xdg_surface->surface);
+                csd = !deco || deco->wlr_server_decoration->mode ==
                         WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
-                view_update_csd_from_client(view, csd);
-        }
 
-        if (xdg_surface->toplevel->client_pending.fullscreen) {
-                container_set_fullscreen(view->container, true);
-                arrange_workspace(view->container->workspace);
-        } else {
-                if (view->container->parent) {
-                        arrange_container(view->container->parent);
-                } else if (view->container->workspace) {
-                        arrange_workspace(view->container->workspace);
-                }
         }
 
+        view_map(view, view->wlr_xdg_surface->surface,
+                xdg_surface->toplevel->client_pending.fullscreen, csd);
+
         transaction_commit_dirty();
 
         xdg_shell_view->commit.notify = handle_commit;