diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-06 16:13:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-06 16:13:26 -0400 |
commit | 640232eb225058a18f20190235f679caf678e1f7 (patch) | |
tree | 4323a9130346ca4d836b0ae70c03877e13310bfc /include | |
parent | Merge pull request #1757 from swaywm/boooooooxes (diff) | |
download | sway-640232eb225058a18f20190235f679caf678e1f7.tar.gz sway-640232eb225058a18f20190235f679caf678e1f7.tar.zst sway-640232eb225058a18f20190235f679caf678e1f7.zip |
Revert "Break everything^W^WUse wlr_box for sway_container"
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/container.h | 10 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index e7a071be..4c60530f 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -68,10 +68,12 @@ struct sway_container { | |||
68 | enum sway_container_layout prev_layout; | 68 | enum sway_container_layout prev_layout; |
69 | enum sway_container_layout workspace_layout; | 69 | enum sway_container_layout workspace_layout; |
70 | 70 | ||
71 | // For C_ROOT, this is the extents of the whole layout box. | 71 | // For C_ROOT, this has no meaning |
72 | // For C_OUTPUT, this is the output position in layout coordinates. | 72 | // For C_OUTPUT, this is the output position in layout coordinates |
73 | // For other types, this is the position in output-local coordinates. | 73 | // For other types, this is the position in output-local coordinates |
74 | struct wlr_box box; | 74 | double x, y; |
75 | // does not include borders or gaps. | ||
76 | double width, height; | ||
75 | 77 | ||
76 | list_t *children; | 78 | list_t *children; |
77 | 79 | ||
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index b2b98ee4..fc5ce21f 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h | |||
@@ -61,7 +61,8 @@ enum sway_container_layout container_get_default_layout( | |||
61 | 61 | ||
62 | void container_sort_workspaces(struct sway_container *output); | 62 | void container_sort_workspaces(struct sway_container *output); |
63 | 63 | ||
64 | void arrange_windows(struct sway_container *container, int width, int height); | 64 | void arrange_windows(struct sway_container *container, |
65 | double width, double height); | ||
65 | 66 | ||
66 | struct sway_container *container_get_in_direction(struct sway_container | 67 | struct sway_container *container_get_in_direction(struct sway_container |
67 | *container, struct sway_seat *seat, enum movement_direction dir); | 68 | *container, struct sway_seat *seat, enum movement_direction dir); |