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/tree | |
parent | Fix getting adjacent output (diff) | |
download | sway-97672295ed50d1d6272876c4a3b6b5607cab05c6.tar.gz sway-97672295ed50d1d6272876c4a3b6b5607cab05c6.tar.zst sway-97672295ed50d1d6272876c4a3b6b5607cab05c6.zip |
Don't unmaximize floating views
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/container.c | 3 | ||||
-rw-r--r-- | sway/tree/view.c | 7 |
2 files changed, 0 insertions, 10 deletions
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) { | |||
920 | container_add_child(workspace, container); | 920 | container_add_child(workspace, container); |
921 | container->width = container->parent->width; | 921 | container->width = container->parent->width; |
922 | container->height = container->parent->height; | 922 | container->height = container->parent->height; |
923 | if (container->type == C_VIEW) { | ||
924 | view_set_tiled(container->sway_view, true); | ||
925 | } | ||
926 | container->is_sticky = false; | 923 | container->is_sticky = false; |
927 | container_reap_empty_recursive(workspace->sway_workspace->floating); | 924 | container_reap_empty_recursive(workspace->sway_workspace->floating); |
928 | } | 925 | } |
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) { | |||
138 | int ly = ws->y + (ws->height - height) / 2; | 138 | int ly = ws->y + (ws->height - height) / 2; |
139 | 139 | ||
140 | view->border_left = view->border_right = view->border_bottom = true; | 140 | view->border_left = view->border_right = view->border_bottom = true; |
141 | view_set_tiled(view, false); | ||
142 | view_configure(view, lx, ly, width, height); | 141 | view_configure(view, lx, ly, width, height); |
143 | } | 142 | } |
144 | 143 | ||
@@ -255,12 +254,6 @@ void view_set_activated(struct sway_view *view, bool activated) { | |||
255 | } | 254 | } |
256 | } | 255 | } |
257 | 256 | ||
258 | void view_set_tiled(struct sway_view *view, bool tiled) { | ||
259 | if (view->impl->set_tiled) { | ||
260 | view->impl->set_tiled(view, tiled); | ||
261 | } | ||
262 | } | ||
263 | |||
264 | // Set fullscreen, but without IPC events or arranging windows. | 257 | // Set fullscreen, but without IPC events or arranging windows. |
265 | void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) { | 258 | void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) { |
266 | if (view->is_fullscreen == fullscreen) { | 259 | if (view->is_fullscreen == fullscreen) { |