3 files changed, 12 insertions, 7 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 6019602c..da6592b4 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -94,9 +94,6 @@ struct sway_container {
 
         // The gaps currently applied to the container.
         double current_gaps;
-        bool has_gaps;
-        double gaps_inner;
-        double gaps_outer;
 
         struct sway_workspace *workspace; // NULL when hidden in the scratchpad
         struct sway_container *parent;    // NULL if container in root of workspace
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 2c7b4c2b..028be536 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -265,6 +265,13 @@ uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
         int height);
 
 /**
+ * Whether or not the view is the only visible view in its tree. If the view
+ * is tiling, there may be floating views. If the view is floating, there may
+ * be tiling views or views in a different floating container.
+ */
+bool view_is_only_visible(struct sway_view *view);
+
+/**
  * Configure the view's position and size based on the container's position and
  * size, taking borders into consideration.
  */
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index e4b616d1..efdae5a1 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -32,10 +32,9 @@ struct sway_workspace {
         enum sway_container_layout layout;
         enum sway_container_layout prev_split_layout;
 
-        double current_gaps;
-        bool has_gaps;
-        double gaps_inner;
-        double gaps_outer;
+        int current_gaps;
+        int gaps_inner;
+        int gaps_outer;
 
         struct sway_output *output; // NULL if no outputs are connected
         list_t *floating;           // struct sway_container
@@ -48,6 +47,8 @@ struct sway_workspace {
 
 extern char *prev_workspace_name;
 
+struct workspace_config *workspace_find_config(const char *ws_name);
+
 struct sway_output *workspace_get_initial_output(const char *name);
 
 struct sway_workspace *workspace_create(struct sway_output *output,