diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-11-17 18:32:03 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-11-17 21:29:42 +1000 |
commit | be9348d25c9556bdabb83d964a8761f920fc4a11 (patch) | |
tree | c06bde3d10e9bfea04acdd9b055cd596f13d4522 /sway/commands/resize.c | |
parent | Merge pull request #3132 from emersion/dispatch-cursor-btn-segfault (diff) | |
download | sway-be9348d25c9556bdabb83d964a8761f920fc4a11.tar.gz sway-be9348d25c9556bdabb83d964a8761f920fc4a11.tar.zst sway-be9348d25c9556bdabb83d964a8761f920fc4a11.zip |
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
Diffstat (limited to 'sway/commands/resize.c')
-rw-r--r-- | sway/commands/resize.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 94ffbbe1..e876f48a 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c | |||
@@ -404,13 +404,10 @@ static struct cmd_results *resize_adjust_floating(enum resize_axis axis, | |||
404 | con->width += grow_width; | 404 | con->width += grow_width; |
405 | con->height += grow_height; | 405 | con->height += grow_height; |
406 | 406 | ||
407 | if (con->view) { | 407 | con->content_x += grow_x; |
408 | struct sway_view *view = con->view; | 408 | con->content_y += grow_y; |
409 | view->x += grow_x; | 409 | con->content_width += grow_width; |
410 | view->y += grow_y; | 410 | con->content_height += grow_height; |
411 | view->width += grow_width; | ||
412 | view->height += grow_height; | ||
413 | } | ||
414 | 411 | ||
415 | arrange_container(con); | 412 | arrange_container(con); |
416 | 413 | ||
@@ -546,13 +543,10 @@ static struct cmd_results *resize_set_floating(struct sway_container *con, | |||
546 | } | 543 | } |
547 | } | 544 | } |
548 | 545 | ||
549 | if (con->view) { | 546 | con->content_x -= grow_width / 2; |
550 | struct sway_view *view = con->view; | 547 | con->content_y -= grow_height / 2; |
551 | view->x -= grow_width / 2; | 548 | con->content_width += grow_width; |
552 | view->y -= grow_height / 2; | 549 | con->content_height += grow_height; |
553 | view->width += grow_width; | ||
554 | view->height += grow_height; | ||
555 | } | ||
556 | 550 | ||
557 | arrange_container(con); | 551 | arrange_container(con); |
558 | 552 | ||