Merge pull request #2205 from RyanDwyer/fix-border-weirdness

Fix border weirdness
This commit is contained in:
Drew DeVault 2018-07-04 06:45:12 -07:00 committed by GitHub
commit eed0b5614f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions

View file

@ -935,6 +935,7 @@ void container_set_floating(struct sway_container *container, bool enable) {
container_add_child(workspace->sway_workspace->floating, container); container_add_child(workspace->sway_workspace->floating, container);
if (container->type == C_VIEW) { if (container->type == C_VIEW) {
view_init_floating(container->sway_view); view_init_floating(container->sway_view);
view_set_tiled(container->sway_view, false);
} }
seat_set_focus(seat, seat_get_focus_inactive(seat, container)); seat_set_focus(seat, seat_get_focus_inactive(seat, container));
container_reap_empty_recursive(workspace); container_reap_empty_recursive(workspace);

View file

@ -164,9 +164,6 @@ void view_init_floating(struct sway_view *view) {
view->border_left = view->border_right = true; view->border_left = view->border_right = true;
container_set_geometry_from_floating_view(view->swayc); container_set_geometry_from_floating_view(view->swayc);
// Don't maximize floating windows
view_set_tiled(view, false);
} }
void view_autoconfigure(struct sway_view *view) { void view_autoconfigure(struct sway_view *view) {
@ -278,7 +275,6 @@ void view_autoconfigure(struct sway_view *view) {
view->y = y; view->y = y;
view->width = width; view->width = width;
view->height = height; view->height = height;
view_set_tiled(view, true);
} }
void view_set_activated(struct sway_view *view, bool activated) { void view_set_activated(struct sway_view *view, bool activated) {