Merge branch 'fix-floating-criteria'

[i3/i3] / src / config_directives.c

diff --git a/src/config_directives.c b/src/config_directives.c
index 8b636c026547c4f910ee7ff1afa512b22401b19f..a7fa3500526e356321edde1db5429658e1756a6d 100644 (file)
--- a/src/config_directives.c
+++ b/src/config_directives.c
@@ -392,8 +392,13 @@ CFGFUN(restart_state, const char *path) {
 }
 
 CFGFUN(popup_during_fullscreen, const char *value) {
-    config.popup_during_fullscreen =
-        (strcmp(value, "ignore") == 0 ? PDF_IGNORE : PDF_LEAVE_FULLSCREEN);
+    if (strcmp(value, "ignore") == 0) {
+        config.popup_during_fullscreen = PDF_IGNORE;
+    } else if (strcmp(value, "leave_fullscreen") == 0) {
+        config.popup_during_fullscreen = PDF_LEAVE_FULLSCREEN;
+    } else {
+        config.popup_during_fullscreen = PDF_SMART;
+    }
 }
 
 CFGFUN(color_single, const char *colorclass, const char *color) {
@@ -526,7 +531,10 @@ CFGFUN(bar_tray_output, const char *output) {
 CFGFUN(bar_color_single, const char *colorclass, const char *color) {
     if (strcmp(colorclass, "background") == 0)
         current_bar.colors.background = sstrdup(color);
-    else current_bar.colors.statusline = sstrdup(color);
+    else if (strcmp(colorclass, "separator") == 0)
+        current_bar.colors.separator = sstrdup(color);
+    else
+        current_bar.colors.statusline = sstrdup(color);
 }
 
 CFGFUN(bar_status_command, const char *command) {