diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-06 16:16:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-06 16:16:05 -0400 |
commit | 5c31b06d88135a62bd917a61e770c8219f6d5d72 (patch) | |
tree | 4323a9130346ca4d836b0ae70c03877e13310bfc /sway/tree/container.c | |
parent | Merge pull request #1757 from swaywm/boooooooxes (diff) | |
parent | Revert "Break everything^W^WUse wlr_box for sway_container" (diff) | |
download | sway-5c31b06d88135a62bd917a61e770c8219f6d5d72.tar.gz sway-5c31b06d88135a62bd917a61e770c8219f6d5d72.tar.zst sway-5c31b06d88135a62bd917a61e770c8219f6d5d72.zip |
Merge pull request #1758 from swaywm/revert-1757-boooooooxes
Revert "Break everything^W^WUse wlr_box for sway_container"
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 04fcee81..ab8363bc 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -333,8 +333,8 @@ struct sway_container *container_view_create(struct sway_container *sibling, | |||
333 | // Setup values | 333 | // Setup values |
334 | swayc->sway_view = sway_view; | 334 | swayc->sway_view = sway_view; |
335 | swayc->name = title ? strdup(title) : NULL; | 335 | swayc->name = title ? strdup(title) : NULL; |
336 | swayc->box.width = 0; | 336 | swayc->width = 0; |
337 | swayc->box.height = 0; | 337 | swayc->height = 0; |
338 | 338 | ||
339 | if (sibling->type == C_WORKSPACE) { | 339 | if (sibling->type == C_WORKSPACE) { |
340 | // Case of focused workspace, just create as child of it | 340 | // Case of focused workspace, just create as child of it |
@@ -418,8 +418,8 @@ struct sway_container *container_at(struct sway_container *parent, | |||
418 | soutput->sway_output->wlr_output); | 418 | soutput->sway_output->wlr_output); |
419 | double ox = lx - output_box->x; | 419 | double ox = lx - output_box->x; |
420 | double oy = ly - output_box->y; | 420 | double oy = ly - output_box->y; |
421 | double view_sx = ox - swayc->box.x; | 421 | double view_sx = ox - swayc->x; |
422 | double view_sy = oy - swayc->box.y; | 422 | double view_sy = oy - swayc->y; |
423 | 423 | ||
424 | double _sx, _sy; | 424 | double _sx, _sy; |
425 | struct wlr_surface *_surface; | 425 | struct wlr_surface *_surface; |