Move view border properties to container struct

This will be needed to implement layout saving and restoring, as we need
to be able to configure borders on a placeholder container which has no
view.

1 files changed, 16 insertions, 4 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 1dd23341..c0c803f1 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -53,16 +53,16 @@ struct sway_container_state {
         struct sway_container *focused_inactive_child;
         bool focused;
 
-        // View properties
-        double view_x, view_y;
-        double view_width, view_height;
-
         enum sway_container_border border;
         int border_thickness;
         bool border_top;
         bool border_bottom;
         bool border_left;
         bool border_right;
+
+        // View properties
+        double view_x, view_y;
+        double view_width, view_height;
 };
 
 struct sway_container {
@@ -91,6 +91,18 @@ struct sway_container {
 
         bool is_fullscreen;
 
+        enum sway_container_border border;
+
+        // Used when the view changes to CSD unexpectedly. This will be a non-B_CSD
+        // border which we use to restore when the view returns to SSD.
+        enum sway_container_border saved_border;
+
+        int border_thickness;
+        bool border_top;
+        bool border_bottom;
+        bool border_left;
+        bool border_right;
+
         // The gaps currently applied to the container.
         double current_gaps;