diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-25 11:15:43 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-01 23:14:58 +1000 |
commit | 13a4b0512e25b8da6e16ca1286f8b62fcc24c5cc (patch) | |
tree | 5e03717e41e4af7282995b15b0938a6f07c4c74d /sway/tree/container.c | |
parent | 754cb7944c2f05b35e39dab9605a184ee9f53efd (diff) |
Fix unfullscreening a floating view
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index c16f1748..fd7ee2c3 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -906,23 +906,6 @@ size_t container_titlebar_height() { return config->font_height + TITLEBAR_V_PADDING * 2; } -static void configure_floating_view(struct sway_view *view) { - struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); - int max_width = ws->width * 0.6666; - int max_height = ws->height * 0.6666; - int width = - view->natural_width > max_width ? max_width : view->natural_width; - int height = - view->natural_height > max_height ? max_height : view->natural_height; - struct sway_container *output = ws->parent; - int lx = output->x + (ws->width - width) / 2; - int ly = output->y + (ws->height - height) / 2; - - view->border_left = view->border_right = view->border_bottom = true; - view_set_maximized(view, false); - view_configure(view, lx, ly, width, height); -} - void container_set_floating(struct sway_container *container, bool enable) { if (container_is_floating(container) == enable) { return; @@ -936,7 +919,7 @@ void container_set_floating(struct sway_container *container, bool enable) { container_remove_child(container); container_add_child(workspace->sway_workspace->floating, container); if (container->type == C_VIEW) { - configure_floating_view(container->sway_view); + view_autoconfigure(container->sway_view); } seat_set_focus(seat, seat_get_focus_inactive(seat, container)); container_reap_empty_recursive(workspace); |