diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-29 11:06:07 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-29 11:08:19 +1000 |
commit | 415a48ac6387a62a59adb8ed1168e851509a0ce3 (patch) | |
tree | fd0027a67439414e164318182be29a3529805543 /include/sway/tree/workspace.h | |
parent | Merge pull request #2724 from RedSoxFan/update-man-pages (diff) | |
download | sway-415a48ac6387a62a59adb8ed1168e851509a0ce3.tar.gz sway-415a48ac6387a62a59adb8ed1168e851509a0ce3.tar.zst sway-415a48ac6387a62a59adb8ed1168e851509a0ce3.zip |
Make gaps implementation consistent with i3-gaps
This changes our gaps implementation to behave like i3-gaps.
Our previous implementation allowed you to set gaps on a per container
basis. This isn't supported by i3-gaps and doesn't seem to have a
practical use case. The gaps_outer and gaps_inner properties on
containers are now removed as they just read the gaps_inner from the
workspace.
`gaps inner|outer <px>` no longer changes the gaps for all workspaces.
It only sets defaults for new workspaces.
`gaps inner|outer current|workspace|all set|plus|minus <px>` is now
runtime only, and the workspace option is now removed. `current` now
sets gaps for the current workspace as opposed to the current container.
`workspace <ws> gaps inner|outer <px>` is now implemented. This sets
defaults for a workspace.
This also fixes a bug where changing the layout of a split container
from linear to tabbed would cause gaps to not be applied to it until you
switch to another workspace and back.
Diffstat (limited to 'include/sway/tree/workspace.h')
-rw-r--r-- | include/sway/tree/workspace.h | 7 |
1 files changed, 3 insertions, 4 deletions
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 { | |||
32 | enum sway_container_layout layout; | 32 | enum sway_container_layout layout; |
33 | enum sway_container_layout prev_split_layout; | 33 | enum sway_container_layout prev_split_layout; |
34 | 34 | ||
35 | double current_gaps; | 35 | int current_gaps; |
36 | bool has_gaps; | 36 | int gaps_inner; |
37 | double gaps_inner; | 37 | int gaps_outer; |
38 | double gaps_outer; | ||
39 | 38 | ||
40 | struct sway_output *output; // NULL if no outputs are connected | 39 | struct sway_output *output; // NULL if no outputs are connected |
41 | list_t *floating; // struct sway_container | 40 | list_t *floating; // struct sway_container |