Merge pull request #2726 from RyanDwyer/overhaul-gaps

Make gaps implementation consistent with i3-gaps

3 files changed, 5 insertions, 7 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 2395bc51..eab48aed 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -174,6 +174,8 @@ struct output_config {
 struct workspace_config {
         char *workspace;
         char *output;
+        int gaps_inner;
+        int gaps_outer;
 };
 
 struct bar_config {
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 5e281a2f..b865a0f2 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/workspace.h b/include/sway/tree/workspace.h
index c8220b39..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