Revert "Break everything^W^WUse wlr_box for sway_container"

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 {
         enum sway_container_layout prev_layout;
         enum sway_container_layout workspace_layout;
 
-        // For C_ROOT, this is the extents of the whole layout box.
-        // For C_OUTPUT, this is the output position in layout coordinates.
-        // For other types, this is the position in output-local coordinates.
-        struct wlr_box box;
+        // For C_ROOT, this has no meaning
+        // For C_OUTPUT, this is the output position in layout coordinates
+        // For other types, this is the position in output-local coordinates
+        double x, y;
+        // does not include borders or gaps.
+        double width, height;
 
         list_t *children;
 
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(
 
 void container_sort_workspaces(struct sway_container *output);
 
-void arrange_windows(struct sway_container *container, int width, int height);
+void arrange_windows(struct sway_container *container,
+                double width, double height);
 
 struct sway_container *container_get_in_direction(struct sway_container
                 *container, struct sway_seat *seat, enum movement_direction dir);