From 02de2a6f65c189bf563cca5b4d3fbc11826ea7f7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 26 May 2018 09:22:10 +1000 Subject: [PATCH] Rename set_maximized functions to set_tiled --- include/sway/tree/view.h | 4 ++-- sway/desktop/xdg_shell.c | 6 +++--- sway/desktop/xdg_shell_v6.c | 6 +++--- sway/desktop/xwayland.c | 6 +++--- sway/tree/container.c | 2 +- sway/tree/view.c | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 6990e5b6..7a94b2c2 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -32,7 +32,7 @@ struct sway_view_impl { void (*configure)(struct sway_view *view, double ox, double oy, int width, int height); void (*set_activated)(struct sway_view *view, bool activated); - void (*set_maximized)(struct sway_view *view, bool maximized); + void (*set_tiled)(struct sway_view *view, bool tiled); void (*set_fullscreen)(struct sway_view *view, bool fullscreen); bool (*wants_floating)(struct sway_view *view); void (*for_each_surface)(struct sway_view *view, @@ -220,7 +220,7 @@ void view_autoconfigure(struct sway_view *view); void view_set_activated(struct sway_view *view, bool activated); -void view_set_maximized(struct sway_view *view, bool maximized); +void view_set_tiled(struct sway_view *view, bool tiled); void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen); diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index ebb12211..73d9477f 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -111,12 +111,12 @@ static void set_activated(struct sway_view *view, bool activated) { } } -static void set_maximized(struct sway_view *view, bool maximized) { +static void set_tiled(struct sway_view *view, bool tiled) { if (xdg_shell_view_from_view(view) == NULL) { return; } struct wlr_xdg_surface *surface = view->wlr_xdg_surface; - wlr_xdg_toplevel_set_maximized(surface, maximized); + wlr_xdg_toplevel_set_maximized(surface, tiled); } static void set_fullscreen(struct sway_view *view, bool fullscreen) { @@ -168,7 +168,7 @@ static const struct sway_view_impl view_impl = { .get_string_prop = get_string_prop, .configure = configure, .set_activated = set_activated, - .set_maximized = set_maximized, + .set_tiled = set_tiled, .set_fullscreen = set_fullscreen, .wants_floating = wants_floating, .for_each_surface = for_each_surface, diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index f3df2fe8..6c98744c 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -110,12 +110,12 @@ static void set_activated(struct sway_view *view, bool activated) { } } -static void set_maximized(struct sway_view *view, bool maximized) { +static void set_tiled(struct sway_view *view, bool tiled) { if (xdg_shell_v6_view_from_view(view) == NULL) { return; } struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6; - wlr_xdg_toplevel_v6_set_maximized(surface, maximized); + wlr_xdg_toplevel_v6_set_maximized(surface, tiled); } static void set_fullscreen(struct sway_view *view, bool fullscreen) { @@ -167,7 +167,7 @@ static const struct sway_view_impl view_impl = { .get_string_prop = get_string_prop, .configure = configure, .set_activated = set_activated, - .set_maximized = set_maximized, + .set_tiled = set_tiled, .set_fullscreen = set_fullscreen, .wants_floating = wants_floating, .for_each_surface = for_each_surface, diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 1373d968..783868bc 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -199,12 +199,12 @@ static void set_activated(struct sway_view *view, bool activated) { wlr_xwayland_surface_activate(surface, activated); } -static void set_maximized(struct sway_view *view, bool maximized) { +static void set_tiled(struct sway_view *view, bool tiled) { if (xwayland_view_from_view(view) == NULL) { return; } struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface; - wlr_xwayland_surface_set_maximized(surface, maximized); + wlr_xwayland_surface_set_maximized(surface, tiled); } static void set_fullscreen(struct sway_view *view, bool fullscreen) { @@ -272,7 +272,7 @@ static const struct sway_view_impl view_impl = { .get_int_prop = get_int_prop, .configure = configure, .set_activated = set_activated, - .set_maximized = set_maximized, + .set_tiled = set_tiled, .set_fullscreen = set_fullscreen, .wants_floating = wants_floating, .close = _close, diff --git a/sway/tree/container.c b/sway/tree/container.c index 532722e8..12f74e37 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -921,7 +921,7 @@ void container_set_floating(struct sway_container *container, bool enable) { container->width = container->parent->width; container->height = container->parent->height; if (container->type == C_VIEW) { - view_set_maximized(container->sway_view, true); + view_set_tiled(container->sway_view, true); } container->is_sticky = false; container_reap_empty_recursive(workspace->sway_workspace->floating); diff --git a/sway/tree/view.c b/sway/tree/view.c index 65961dd9..3de9879e 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -139,7 +139,7 @@ static void view_autoconfigure_floating(struct sway_view *view) { int ly = output->y + (ws->height - height) / 2; view->border_left = view->border_right = view->border_bottom = true; - view_set_maximized(view, false); + view_set_tiled(view, false); view_configure(view, lx, ly, width, height); } @@ -257,9 +257,9 @@ void view_set_activated(struct sway_view *view, bool activated) { } } -void view_set_maximized(struct sway_view *view, bool maximized) { - if (view->impl->set_maximized) { - view->impl->set_maximized(view, maximized); +void view_set_tiled(struct sway_view *view, bool tiled) { + if (view->impl->set_tiled) { + view->impl->set_tiled(view, tiled); } }