diff options
-rw-r--r-- | include/sway/tree/view.h | 2 | ||||
-rw-r--r-- | sway/decoration.c | 2 | ||||
-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 | ||||
-rw-r--r-- | sway/tree/view.c | 2 | ||||
-rw-r--r-- | sway/xdg_decoration.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 49df7c88..e7aaffd7 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -275,7 +275,7 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled); | |||
275 | * Updates the view's border setting when the client unexpectedly changes their | 275 | * Updates the view's border setting when the client unexpectedly changes their |
276 | * decoration mode. | 276 | * decoration mode. |
277 | */ | 277 | */ |
278 | void view_set_csd_from_client(struct sway_view *view, bool enabled); | 278 | void view_update_csd_from_client(struct sway_view *view, bool enabled); |
279 | 279 | ||
280 | void view_set_tiled(struct sway_view *view, bool tiled); | 280 | void view_set_tiled(struct sway_view *view, bool tiled); |
281 | 281 | ||
diff --git a/sway/decoration.c b/sway/decoration.c index fea6ed4c..849fa89c 100644 --- a/sway/decoration.c +++ b/sway/decoration.c | |||
@@ -28,7 +28,7 @@ static void server_decoration_handle_mode(struct wl_listener *listener, | |||
28 | 28 | ||
29 | bool csd = deco->wlr_server_decoration->mode == | 29 | bool csd = deco->wlr_server_decoration->mode == |
30 | WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; | 30 | WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; |
31 | view_set_csd_from_client(view, csd); | 31 | view_update_csd_from_client(view, csd); |
32 | 32 | ||
33 | arrange_container(view->container); | 33 | arrange_container(view->container); |
34 | transaction_commit_dirty(); | 34 | transaction_commit_dirty(); |
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) { |
diff --git a/sway/tree/view.c b/sway/tree/view.c index c370de2d..1c94de4c 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -318,7 +318,7 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled) { | |||
318 | } | 318 | } |
319 | } | 319 | } |
320 | 320 | ||
321 | void view_set_csd_from_client(struct sway_view *view, bool enabled) { | 321 | void view_update_csd_from_client(struct sway_view *view, bool enabled) { |
322 | if (enabled && view->border != B_CSD) { | 322 | if (enabled && view->border != B_CSD) { |
323 | view->saved_border = view->border; | 323 | view->saved_border = view->border; |
324 | view->border = B_CSD; | 324 | view->border = B_CSD; |
diff --git a/sway/xdg_decoration.c b/sway/xdg_decoration.c index 2e7e4bd0..80b2f57e 100644 --- a/sway/xdg_decoration.c +++ b/sway/xdg_decoration.c | |||
@@ -26,7 +26,7 @@ static void xdg_decoration_handle_surface_commit(struct wl_listener *listener, | |||
26 | WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE; | 26 | WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE; |
27 | struct sway_view *view = decoration->view; | 27 | struct sway_view *view = decoration->view; |
28 | 28 | ||
29 | view_set_csd_from_client(view, csd); | 29 | view_update_csd_from_client(view, csd); |
30 | 30 | ||
31 | arrange_container(view->container); | 31 | arrange_container(view->container); |
32 | transaction_commit_dirty(); | 32 | transaction_commit_dirty(); |