diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway/tree/container.h | 14 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 4 |
2 files changed, 8 insertions, 10 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; struct sway_container_state { // Container properties enum sway_container_layout layout; - double con_x, con_y; - double con_width, con_height; + double x, y; + double width, height; bool is_fullscreen; @@ -60,9 +60,8 @@ struct sway_container_state { bool border_left; bool border_right; - // View properties - double view_x, view_y; - double view_width, view_height; + double content_x, content_y; + double content_width, content_height; }; struct sway_container { @@ -89,6 +88,9 @@ struct sway_container { double saved_x, saved_y; double saved_width, saved_height; + double content_x, content_y; + int content_width, content_height; + bool is_fullscreen; enum sway_container_border border; @@ -210,7 +212,7 @@ void container_init_floating(struct sway_container *container); void container_set_floating(struct sway_container *container, bool enable); -void container_set_geometry_from_floating_view(struct sway_container *con); +void container_set_geometry_from_content(struct sway_container *con); /** * Determine if the given container is itself floating. diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4a8c3cb1..8f045c6a 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -67,10 +67,6 @@ struct sway_view { pid_t pid; - // Geometry of the view itself (excludes borders) in layout coordinates - double x, y; - int width, height; - double saved_x, saved_y; int saved_width, saved_height; |