Merge remote-tracking branch 'upstream/master' into atomic

This commit is contained in:
Ryan Dwyer 2018-06-11 11:03:43 +10:00
commit 9e96cfd310
17 changed files with 507 additions and 41 deletions

View file

@ -60,6 +60,11 @@ struct sway_container_state {
double swayc_x, swayc_y;
double swayc_width, swayc_height;
bool has_gaps;
double current_gaps;
double gaps_inner;
double gaps_outer;
//struct sway_container *parent;
//list_t *children;
@ -112,6 +117,13 @@ struct sway_container {
double saved_x, saved_y;
double saved_width, saved_height;
// The gaps currently applied to the container.
double current_gaps;
bool has_gaps;
double gaps_inner;
double gaps_outer;
list_t *children;
struct sway_container *parent;