sway

commit f16529e2588f5e71d6777f4c06dfb58b29308cd0
parent 21ff87d72b44604d348cf71da3175b85ac5b2f75
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Thu, 27 Sep 2018 23:00:10 +1000

Remove server-decoration assumption if view supports xdg-decoration

Diffstat:
M
sway/desktop/xdg_shell.c
 | 
12
+++++++-----

1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
@@ -377,11 +377,13 @@ static void handle_map(struct wl_listener *listener, void *data) {
 
 	view_map(view, view->wlr_xdg_surface->surface);
 
-	struct sway_server_decoration *deco =
-		decoration_from_surface(xdg_surface->surface);
-	bool csd = !deco || deco->wlr_server_decoration->mode ==
-		WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
-	view_update_csd_from_client(view, csd);
+	if (!view->xdg_decoration) {
+		struct sway_server_decoration *deco =
+			decoration_from_surface(xdg_surface->surface);
+		bool 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);