alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Rename set_maximized functions to set_tiled

Browse source
This commit is contained in:
Ryan Dwyer 2018-05-26 09:22:10 +10:00
parent 5d69a56209
commit 02de2a6f65
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/tree/view.h
View file

@ -32,7 +32,7 @@ struct sway_view_impl {
void (*configure)(struct sway_view *view, double ox, double oy, int width, void (*configure)(struct sway_view *view, double ox, double oy, int width,
int height); int height);
void (*set_activated)(struct sway_view *view, bool activated); 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); void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
bool (*wants_floating)(struct sway_view *view); bool (*wants_floating)(struct sway_view *view);
void (*for_each_surface)(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_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); void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen);

6
sway/desktop/xdg_shell.c
View file

@ -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) { if (xdg_shell_view_from_view(view) == NULL) {
return; return;
} }
struct wlr_xdg_surface *surface = view->wlr_xdg_surface; 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) { 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, .get_string_prop = get_string_prop,
.configure = configure, .configure = configure,
.set_activated = set_activated, .set_activated = set_activated,
.set_maximized = set_maximized, .set_tiled = set_tiled,
.set_fullscreen = set_fullscreen, .set_fullscreen = set_fullscreen,
.wants_floating = wants_floating, .wants_floating = wants_floating,
.for_each_surface = for_each_surface, .for_each_surface = for_each_surface,

6
sway/desktop/xdg_shell_v6.c
View file

@ -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) { if (xdg_shell_v6_view_from_view(view) == NULL) {
return; return;
} }
struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6; 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) { 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, .get_string_prop = get_string_prop,
.configure = configure, .configure = configure,
.set_activated = set_activated, .set_activated = set_activated,
.set_maximized = set_maximized, .set_tiled = set_tiled,
.set_fullscreen = set_fullscreen, .set_fullscreen = set_fullscreen,
.wants_floating = wants_floating, .wants_floating = wants_floating,
.for_each_surface = for_each_surface, .for_each_surface = for_each_surface,

6
sway/desktop/xwayland.c
View file

@ -199,12 +199,12 @@ static void set_activated(struct sway_view *view, bool activated) {
wlr_xwayland_surface_activate(surface, 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) { if (xwayland_view_from_view(view) == NULL) {
return; return;
} }
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface; 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) { 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, .get_int_prop = get_int_prop,
.configure = configure, .configure = configure,
.set_activated = set_activated, .set_activated = set_activated,
.set_maximized = set_maximized, .set_tiled = set_tiled,
.set_fullscreen = set_fullscreen, .set_fullscreen = set_fullscreen,
.wants_floating = wants_floating, .wants_floating = wants_floating,
.close = _close, .close = _close,

2
sway/tree/container.c
View file

@ -921,7 +921,7 @@ void container_set_floating(struct sway_container *container, bool enable) {
container->width = container->parent->width; container->width = container->parent->width;
container->height = container->parent->height; container->height = container->parent->height;
if (container->type == C_VIEW) { if (container->type == C_VIEW) {
view_set_maximized(container->sway_view, true); view_set_tiled(container->sway_view, true);
} }
container->is_sticky = false; container->is_sticky = false;
container_reap_empty_recursive(workspace->sway_workspace->floating); container_reap_empty_recursive(workspace->sway_workspace->floating);

8
sway/tree/view.c
View file

@ -139,7 +139,7 @@ static void view_autoconfigure_floating(struct sway_view *view) {
int ly = output->y + (ws->height - height) / 2; int ly = output->y + (ws->height - height) / 2;
view->border_left = view->border_right = view->border_bottom = true; 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); 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) { void view_set_tiled(struct sway_view *view, bool tiled) {
if (view->impl->set_maximized) { if (view->impl->set_tiled) {
view->impl->set_maximized(view, maximized); view->impl->set_tiled(view, tiled);
} }
} }