aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sway/config.c2
-rw-r--r--sway/container.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/sway/config.c b/sway/config.c
index 88e6fad1..98351b1e 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -487,7 +487,7 @@ static bool load_config(const char *path, struct sway_config *config) {
487} 487}
488 488
489static int qstrcmp(const void* a, const void* b) { 489static int qstrcmp(const void* a, const void* b) {
490 return strcmp(*((char**) a), *((char**) b)); 490 return strcmp(*((char**) a), *((char**) b));
491} 491}
492 492
493bool load_main_config(const char *file, bool is_active) { 493bool load_main_config(const char *file, bool is_active) {
diff --git a/sway/container.c b/sway/container.c
index 2f656bd8..9b1eac60 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -401,9 +401,9 @@ void floating_view_sane_size(swayc_t *view) {
401 config->floating_maximum_height = swayc_active_workspace()->height; 401 config->floating_maximum_height = swayc_active_workspace()->height;
402 402
403 } else if (config->floating_maximum_height != -1 && 403 } else if (config->floating_maximum_height != -1 &&
404 view->desired_height > config->floating_maximum_height) { 404 view->desired_height > config->floating_maximum_height) {
405 view->desired_height = config->floating_maximum_height; 405 view->desired_height = config->floating_maximum_height;
406 } 406 }
407 407
408 // if 0 do not resize, only enforce max value 408 // if 0 do not resize, only enforce max value
409 if (config->floating_maximum_width == 0) { 409 if (config->floating_maximum_width == 0) {