diff options
Diffstat (limited to 'include/sway/tree/container.h')
-rw-r--r-- | include/sway/tree/container.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index d3155eb3..f907aad2 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -41,8 +41,8 @@ enum wlr_direction; | |||
41 | struct sway_container_state { | 41 | struct sway_container_state { |
42 | // Container properties | 42 | // Container properties |
43 | enum sway_container_layout layout; | 43 | enum sway_container_layout layout; |
44 | double con_x, con_y; | 44 | double x, y; |
45 | double con_width, con_height; | 45 | double width, height; |
46 | 46 | ||
47 | bool is_fullscreen; | 47 | bool is_fullscreen; |
48 | 48 | ||
@@ -60,9 +60,8 @@ struct sway_container_state { | |||
60 | bool border_left; | 60 | bool border_left; |
61 | bool border_right; | 61 | bool border_right; |
62 | 62 | ||
63 | // View properties | 63 | double content_x, content_y; |
64 | double view_x, view_y; | 64 | double content_width, content_height; |
65 | double view_width, view_height; | ||
66 | }; | 65 | }; |
67 | 66 | ||
68 | struct sway_container { | 67 | struct sway_container { |
@@ -89,6 +88,9 @@ struct sway_container { | |||
89 | double saved_x, saved_y; | 88 | double saved_x, saved_y; |
90 | double saved_width, saved_height; | 89 | double saved_width, saved_height; |
91 | 90 | ||
91 | double content_x, content_y; | ||
92 | int content_width, content_height; | ||
93 | |||
92 | bool is_fullscreen; | 94 | bool is_fullscreen; |
93 | 95 | ||
94 | enum sway_container_border border; | 96 | enum sway_container_border border; |
@@ -210,7 +212,7 @@ void container_init_floating(struct sway_container *container); | |||
210 | 212 | ||
211 | void container_set_floating(struct sway_container *container, bool enable); | 213 | void container_set_floating(struct sway_container *container, bool enable); |
212 | 214 | ||
213 | void container_set_geometry_from_floating_view(struct sway_container *con); | 215 | void container_set_geometry_from_content(struct sway_container *con); |
214 | 216 | ||
215 | /** | 217 | /** |
216 | * Determine if the given container is itself floating. | 218 | * Determine if the given container is itself floating. |