diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-04-09 17:38:43 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-04-09 17:38:43 -0400 |
commit | a71ca65d88b01f5621b0ff44f7b366c4135d6b2f (patch) | |
tree | 2b2bd1e9196d6e7ef98d58f88b0cecfea7f7d9b2 | |
parent | Merge pull request #572 from fluxchief/swaylock-flush (diff) | |
parent | Don't init desired width/height on new_view (diff) | |
download | sway-a71ca65d88b01f5621b0ff44f7b366c4135d6b2f.tar.gz sway-a71ca65d88b01f5621b0ff44f7b366c4135d6b2f.tar.zst sway-a71ca65d88b01f5621b0ff44f7b366c4135d6b2f.zip |
Merge pull request #579 from mikkeloscar/new_view-geometry
Don't init desired width/height on new_view
-rw-r--r-- | sway/container.c | 7 | ||||
-rw-r--r-- | sway/handlers.c | 2 |
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) { | |||
265 | view->visible = true; | 265 | view->visible = true; |
266 | view->is_focused = true; | 266 | view->is_focused = true; |
267 | view->sticky = false; | 267 | view->sticky = false; |
268 | // Setup geometry | ||
269 | struct wlc_geometry geometry; | ||
270 | wlc_view_get_visible_geometry(handle, &geometry); | ||
271 | view->width = 0; | 268 | view->width = 0; |
272 | view->height = 0; | 269 | view->height = 0; |
273 | view->desired_width = geometry.size.w; | 270 | view->desired_width = -1; |
274 | view->desired_height = geometry.size.h; | 271 | view->desired_height = -1; |
275 | // setup border | 272 | // setup border |
276 | view->border_type = config->border; | 273 | view->border_type = config->border; |
277 | view->border_thickness = config->border_thickness; | 274 | 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 | |||
354 | view->height = view->desired_height; | 354 | view->height = view->desired_height; |
355 | view->x = geometry->origin.x; | 355 | view->x = geometry->origin.x; |
356 | view->y = geometry->origin.y; | 356 | view->y = geometry->origin.y; |
357 | arrange_windows(view->parent, -1, -1); | 357 | update_geometry(view); |
358 | } | 358 | } |
359 | } | 359 | } |
360 | } | 360 | } |