Rename view_set_csd_from_client to view_update_csd_from_client

master
Ryan Dwyer 6 years ago
parent efcfe57b10
commit 6d0442c0c2

@ -275,7 +275,7 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled);
* Updates the view's border setting when the client unexpectedly changes their * Updates the view's border setting when the client unexpectedly changes their
* decoration mode. * decoration mode.
*/ */
void view_set_csd_from_client(struct sway_view *view, bool enabled); void view_update_csd_from_client(struct sway_view *view, bool enabled);
void view_set_tiled(struct sway_view *view, bool tiled); void view_set_tiled(struct sway_view *view, bool tiled);

@ -28,7 +28,7 @@ static void server_decoration_handle_mode(struct wl_listener *listener,
bool csd = deco->wlr_server_decoration->mode == bool csd = deco->wlr_server_decoration->mode ==
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
view_set_csd_from_client(view, csd); view_update_csd_from_client(view, csd);
arrange_container(view->container); arrange_container(view->container);
transaction_commit_dirty(); transaction_commit_dirty();

@ -381,7 +381,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
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_set_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);

@ -378,7 +378,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
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_set_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);

@ -250,7 +250,7 @@ static void handle_set_decorations(struct wl_listener *listener, void *data) {
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
bool csd = xsurface->decorations != WLR_XWAYLAND_SURFACE_DECORATIONS_ALL; bool csd = xsurface->decorations != WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
view_set_csd_from_client(view, csd); view_update_csd_from_client(view, csd);
} }
static void _close(struct sway_view *view) { static void _close(struct sway_view *view) {

@ -318,7 +318,7 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled) {
} }
} }
void view_set_csd_from_client(struct sway_view *view, bool enabled) { void view_update_csd_from_client(struct sway_view *view, bool enabled) {
if (enabled && view->border != B_CSD) { if (enabled && view->border != B_CSD) {
view->saved_border = view->border; view->saved_border = view->border;
view->border = B_CSD; view->border = B_CSD;

@ -26,7 +26,7 @@ static void xdg_decoration_handle_surface_commit(struct wl_listener *listener,
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE; WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
struct sway_view *view = decoration->view; struct sway_view *view = decoration->view;
view_set_csd_from_client(view, csd); view_update_csd_from_client(view, csd);
arrange_container(view->container); arrange_container(view->container);
transaction_commit_dirty(); transaction_commit_dirty();

Loading…
Cancel
Save