1 files changed, 5 insertions, 17 deletions

diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 95ca396c..8c8085f7 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -171,15 +171,6 @@ static bool wants_floating(struct sway_view *view) {
                 || toplevel->parent;
 }
 
-static bool has_client_side_decorations(struct sway_view *view) {
-        struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
-                xdg_shell_v6_view_from_view(view);
-        if (xdg_shell_v6_view == NULL) {
-                return true;
-        }
-        return xdg_shell_v6_view->deco_mode != WLR_SERVER_DECORATION_MANAGER_MODE_SERVER;
-}
-
 static void for_each_surface(struct sway_view *view,
                 wlr_surface_iterator_func_t iterator, void *user_data) {
         if (xdg_shell_v6_view_from_view(view) == NULL) {
@@ -237,7 +228,6 @@ static const struct sway_view_impl view_impl = {
         .set_tiled = set_tiled,
         .set_fullscreen = set_fullscreen,
         .wants_floating = wants_floating,
-        .has_client_side_decorations = has_client_side_decorations,
         .for_each_surface = for_each_surface,
         .for_each_popup = for_each_popup,
         .close = _close,
@@ -382,15 +372,13 @@ static void handle_map(struct wl_listener *listener, void *data) {
                 view->natural_height = view->wlr_xdg_surface_v6->surface->current.height;
         }
 
+        view_map(view, view->wlr_xdg_surface_v6->surface);
+
         struct sway_server_decoration *deco =
                 decoration_from_surface(xdg_surface->surface);
-        if (deco != NULL) {
-                xdg_shell_v6_view->deco_mode = deco->wlr_server_decoration->mode;
-        } else {
-                xdg_shell_v6_view->deco_mode = WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
-        }
-
-        view_map(view, view->wlr_xdg_surface_v6->surface);
+        bool csd = !deco || deco->wlr_server_decoration->mode ==
+                        WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
+        view_set_csd_from_client(view, csd);
 
         if (xdg_surface->toplevel->client_pending.fullscreen) {
                 container_set_fullscreen(view->container, true);