diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-27 17:09:05 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-27 22:51:37 +1000 |
| commit | 6d0442c0c2cfcb75f855348b8133abcb2f3c2427 (patch) | |
| tree | 9d868c6458b573712f52c3c5b652dc702dc731d5 /sway/desktop | |
| parent | Remove CSD from toggle list if client doesn't support it (diff) | |
| download | sway-6d0442c0c2cfcb75f855348b8133abcb2f3c2427.tar.gz sway-6d0442c0c2cfcb75f855348b8133abcb2f3c2427.tar.zst sway-6d0442c0c2cfcb75f855348b8133abcb2f3c2427.zip | |
Rename view_set_csd_from_client to view_update_csd_from_client
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/xdg_shell.c | 2 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 2 | ||||
| -rw-r--r-- | sway/desktop/xwayland.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index d563edae..2680af64 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c | |||
| @@ -381,7 +381,7 @@ static void handle_map(struct wl_listener *listener, void *data) { | |||
| 381 | decoration_from_surface(xdg_surface->surface); | 381 | decoration_from_surface(xdg_surface->surface); |
| 382 | bool csd = !deco || deco->wlr_server_decoration->mode == | 382 | bool csd = !deco || deco->wlr_server_decoration->mode == |
| 383 | WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; | 383 | WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; |
| 384 | view_set_csd_from_client(view, csd); | 384 | view_update_csd_from_client(view, csd); |
| 385 | 385 | ||
| 386 | if (xdg_surface->toplevel->client_pending.fullscreen) { | 386 | if (xdg_surface->toplevel->client_pending.fullscreen) { |
| 387 | container_set_fullscreen(view->container, true); | 387 | container_set_fullscreen(view->container, true); |
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 8c8085f7..a7838c0f 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
| @@ -378,7 +378,7 @@ static void handle_map(struct wl_listener *listener, void *data) { | |||
| 378 | decoration_from_surface(xdg_surface->surface); | 378 | decoration_from_surface(xdg_surface->surface); |
| 379 | bool csd = !deco || deco->wlr_server_decoration->mode == | 379 | bool csd = !deco || deco->wlr_server_decoration->mode == |
| 380 | WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; | 380 | WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; |
| 381 | view_set_csd_from_client(view, csd); | 381 | view_update_csd_from_client(view, csd); |
| 382 | 382 | ||
| 383 | if (xdg_surface->toplevel->client_pending.fullscreen) { | 383 | if (xdg_surface->toplevel->client_pending.fullscreen) { |
| 384 | container_set_fullscreen(view->container, true); | 384 | container_set_fullscreen(view->container, true); |
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index f1205518..4c710f7e 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
| @@ -250,7 +250,7 @@ static void handle_set_decorations(struct wl_listener *listener, void *data) { | |||
| 250 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; | 250 | struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; |
| 251 | 251 | ||
| 252 | bool csd = xsurface->decorations != WLR_XWAYLAND_SURFACE_DECORATIONS_ALL; | 252 | bool csd = xsurface->decorations != WLR_XWAYLAND_SURFACE_DECORATIONS_ALL; |
| 253 | view_set_csd_from_client(view, csd); | 253 | view_update_csd_from_client(view, csd); |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | static void _close(struct sway_view *view) { | 256 | static void _close(struct sway_view *view) { |