diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-02-14 15:51:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-14 15:51:59 -0500 |
commit | 76614efb16527420017291cd47de176b11440d38 (patch) | |
tree | d510f735c545d09af738fcbafe06b266089f809c | |
parent | Merge pull request #1073 from Hummer12007/patch-3 (diff) | |
parent | use absolute view geometry to calculate position (diff) | |
download | sway-76614efb16527420017291cd47de176b11440d38.tar.gz sway-76614efb16527420017291cd47de176b11440d38.tar.zst sway-76614efb16527420017291cd47de176b11440d38.zip |
Merge pull request #1075 from zandrmartin/floating-positioning
use absolute view geometry to calculate position
-rw-r--r-- | sway/container.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sway/container.c b/sway/container.c index 11dcdb7f..2f656bd8 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -346,23 +346,23 @@ swayc_t *new_floating_view(wlc_handle handle) { | |||
346 | view->sticky = false; | 346 | view->sticky = false; |
347 | 347 | ||
348 | // Set the geometry of the floating view | 348 | // Set the geometry of the floating view |
349 | struct wlc_geometry geometry; | 349 | const struct wlc_geometry *geometry = wlc_view_get_geometry(handle); |
350 | wlc_view_get_visible_geometry(handle, &geometry); | ||
351 | 350 | ||
352 | // give it requested geometry, but place in center if possible | 351 | // give it requested geometry, but place in center if possible |
353 | // in top left otherwise | 352 | // in top left otherwise |
354 | if (geometry.size.w != 0) { | 353 | if (geometry->size.w != 0) { |
355 | view->x = (swayc_active_workspace()->width - geometry.size.w) / 2; | 354 | view->x = (swayc_active_workspace()->width - geometry->size.w) / 2; |
356 | } else { | 355 | } else { |
357 | view->x = 0; | 356 | view->x = 0; |
358 | } | 357 | } |
359 | if (geometry.size.h != 0) { | 358 | if (geometry->size.h != 0) { |
360 | view->y = (swayc_active_workspace()->height - geometry.size.h) / 2; | 359 | view->y = (swayc_active_workspace()->height - geometry->size.h) / 2; |
361 | } else { | 360 | } else { |
362 | view->y = 0; | 361 | view->y = 0; |
363 | } | 362 | } |
364 | view->width = geometry.size.w; | 363 | |
365 | view->height = geometry.size.h; | 364 | view->width = geometry->size.w; |
365 | view->height = geometry->size.h; | ||
366 | 366 | ||
367 | view->desired_width = view->width; | 367 | view->desired_width = view->width; |
368 | view->desired_height = view->height; | 368 | view->desired_height = view->height; |