diff options
| author | Zandr Martin <zandrmartin@gmail.com> | 2017-03-13 07:35:12 -0400 |
|---|---|---|
| committer | Zandr Martin <zandrmartin@gmail.com> | 2017-03-13 07:35:12 -0400 |
| commit | b507462d1c66e11cce76e069a508621dc9599f07 (patch) | |
| tree | 52cc52fb0ec42085c37bee5f4f2e5c5f10cf2631 /sway/container.c | |
| parent | 18450dd16a3909d0ea581f5f9cad4128751870cc (diff) | |
| parent | 2e1083f52cbec40ed00df27dd1fb5b4d42d9254b (diff) | |
Merge branch 'master' of git://github.com/SirCmpwn/sway into new-command-aliases
Diffstat (limited to 'sway/container.c')
| -rw-r--r-- | sway/container.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/container.c b/sway/container.c index 2f656bd8..d43ee35e 100644 --- a/sway/container.c +++ b/sway/container.c @@ -1,3 +1,4 @@ +#define _XOPEN_SOURCE 500 #include <ctype.h> #include <stdlib.h> #include <stdbool.h> @@ -18,7 +19,6 @@ #define ASSERT_NONNULL(PTR) \ sway_assert (PTR, #PTR "must be non-null") - static swayc_t *new_swayc(enum swayc_types type) { // next id starts at 1 because 0 is assigned to root_container in layout.c static size_t next_id = 1; @@ -401,9 +401,9 @@ void floating_view_sane_size(swayc_t *view) { config->floating_maximum_height = swayc_active_workspace()->height; } else if (config->floating_maximum_height != -1 && - view->desired_height > config->floating_maximum_height) { - view->desired_height = config->floating_maximum_height; - } + view->desired_height > config->floating_maximum_height) { + view->desired_height = config->floating_maximum_height; + } // if 0 do not resize, only enforce max value if (config->floating_maximum_width == 0) { |