Remove server-decoration assumption if view supports xdg-decoration

This commit is contained in:
Ryan Dwyer 2018-09-27 23:00:10 +10:00
parent 21ff87d72b
commit f16529e258

View file

@ -377,11 +377,13 @@ static void handle_map(struct wl_listener *listener, void *data) {
view_map(view, view->wlr_xdg_surface->surface); view_map(view, view->wlr_xdg_surface->surface);
if (!view->xdg_decoration) {
struct sway_server_decoration *deco = struct sway_server_decoration *deco =
decoration_from_surface(xdg_surface->surface); decoration_from_surface(xdg_surface->surface);
bool csd = !deco || deco->wlr_server_decoration->mode == bool csd = !deco || deco->wlr_server_decoration->mode ==
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
view_update_csd_from_client(view, csd); view_update_csd_from_client(view, csd);
}
if (xdg_surface->toplevel->client_pending.fullscreen) { if (xdg_surface->toplevel->client_pending.fullscreen) {
container_set_fullscreen(view->container, true); container_set_fullscreen(view->container, true);