diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-27 23:43:05 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-01 23:14:58 +1000 |
commit | 97672295ed50d1d6272876c4a3b6b5607cab05c6 (patch) | |
tree | 00b7e77be7e7b1323f494a6e6e075490e37605b1 /sway | |
parent | 40af5d81a1da972cdd59ecb0372ee756433aba26 (diff) |
Don't unmaximize floating views
Diffstat (limited to 'sway')
-rw-r--r-- | sway/desktop/xdg_shell.c | 9 | ||||
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 9 | ||||
-rw-r--r-- | sway/desktop/xwayland.c | 9 | ||||
-rw-r--r-- | sway/tree/container.c | 3 | ||||
-rw-r--r-- | sway/tree/view.c | 7 |
5 files changed, 0 insertions, 37 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 30990f67..7a39a84c 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -111,14 +111,6 @@ static void set_activated(struct sway_view *view, bool activated) { } } -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, tiled); -} - static void set_fullscreen(struct sway_view *view, bool fullscreen) { if (xdg_shell_view_from_view(view) == NULL) { return; @@ -170,7 +162,6 @@ static const struct sway_view_impl view_impl = { .get_string_prop = get_string_prop, .configure = configure, .set_activated = set_activated, - .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 7cba6e49..b1b8091b 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -110,14 +110,6 @@ static void set_activated(struct sway_view *view, bool activated) { } } -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, tiled); -} - static void set_fullscreen(struct sway_view *view, bool fullscreen) { if (xdg_shell_v6_view_from_view(view) == NULL) { return; @@ -169,7 +161,6 @@ static const struct sway_view_impl view_impl = { .get_string_prop = get_string_prop, .configure = configure, .set_activated = set_activated, - .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 7dc860aa..d0fbcaeb 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -175,14 +175,6 @@ static void set_activated(struct sway_view *view, bool activated) { wlr_xwayland_surface_activate(surface, activated); } -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, tiled); -} - static void set_fullscreen(struct sway_view *view, bool fullscreen) { if (xwayland_view_from_view(view) == NULL) { return; @@ -232,7 +224,6 @@ static const struct sway_view_impl view_impl = { .get_int_prop = get_int_prop, .configure = configure, .set_activated = set_activated, - .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 4e041508..9e70da09 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -920,9 +920,6 @@ void container_set_floating(struct sway_container *container, bool enable) { container_add_child(workspace, container); container->width = container->parent->width; container->height = container->parent->height; - if (container->type == C_VIEW) { - 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 30d5c7b4..6e589611 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -138,7 +138,6 @@ static void view_autoconfigure_floating(struct sway_view *view) { int ly = ws->y + (ws->height - height) / 2; view->border_left = view->border_right = view->border_bottom = true; - view_set_tiled(view, false); view_configure(view, lx, ly, width, height); } @@ -255,12 +254,6 @@ void view_set_activated(struct sway_view *view, bool activated) { } } -void view_set_tiled(struct sway_view *view, bool tiled) { - if (view->impl->set_tiled) { - view->impl->set_tiled(view, tiled); - } -} - // Set fullscreen, but without IPC events or arranging windows. void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) { if (view->is_fullscreen == fullscreen) { |