aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2016-04-09 17:38:43 -0400
committerDrew DeVault <sir@cmpwn.com>2016-04-09 17:38:43 -0400
commita71ca65d88b01f5621b0ff44f7b366c4135d6b2f (patch)
tree2b2bd1e9196d6e7ef98d58f88b0cecfea7f7d9b2
parent9f4df8b7582368a5cb66033f3889c3d86b07a8a3 (diff)
parentcfea40dce3b203962a61b6f745bffebad43d19a6 (diff)
downloadsway-a71ca65d88b01f5621b0ff44f7b366c4135d6b2f.tar.xz
Merge pull request #579 from mikkeloscar/new_view-geometry
Don't init desired width/height on new_view
-rw-r--r--sway/container.c7
-rw-r--r--sway/handlers.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/sway/container.c b/sway/container.c
index d82a1e21..6dfc608d 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -265,13 +265,10 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) {
view->visible = true;
view->is_focused = true;
view->sticky = false;
- // Setup geometry
- struct wlc_geometry geometry;
- wlc_view_get_visible_geometry(handle, &geometry);
view->width = 0;
view->height = 0;
- view->desired_width = geometry.size.w;
- view->desired_height = geometry.size.h;
+ view->desired_width = -1;
+ view->desired_height = -1;
// setup border
view->border_type = config->border;
view->border_thickness = config->border_thickness;
diff --git a/sway/handlers.c b/sway/handlers.c
index f96a8e9d..f691ceda 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -354,7 +354,7 @@ static void handle_view_geometry_request(wlc_handle handle, const struct wlc_geo
view->height = view->desired_height;
view->x = geometry->origin.x;
view->y = geometry->origin.y;
- arrange_windows(view->parent, -1, -1);
+ update_geometry(view);
}
}
}