aboutsummaryrefslogtreecommitdiff
path: root/include/sway/tree
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-09-30 13:47:35 +0200
committerGitHub <noreply@github.com>2018-09-30 13:47:35 +0200
commitf1dbdce0b2cfb6a71f972dd58180337c8ad27096 (patch)
tree061fc029a12ea5edd42444a1c03176083b210bf3 /include/sway/tree
parente518c5dbaf93ab4f83031e83e03823d85469a30f (diff)
parent7661c71b3323f4bc6a8253b16cb12be8ef1a1d12 (diff)
Merge pull request #2726 from RyanDwyer/overhaul-gaps
Make gaps implementation consistent with i3-gaps
Diffstat (limited to 'include/sway/tree')
-rw-r--r--include/sway/tree/container.h3
-rw-r--r--include/sway/tree/workspace.h7
2 files changed, 3 insertions, 7 deletions
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