diff options
-rw-r--r-- | include/swaybar/config.h | 1 | ||||
-rw-r--r-- | sway/commands/bar/tray_output.c | 2 | ||||
-rw-r--r-- | swaybar/bar.c | 4 | ||||
-rw-r--r-- | swaybar/ipc.c | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/include/swaybar/config.h b/include/swaybar/config.h index def70d5b..1f6577bd 100644 --- a/include/swaybar/config.h +++ b/include/swaybar/config.h | |||
@@ -69,6 +69,7 @@ struct swaybar_config { | |||
69 | #if HAVE_TRAY | 69 | #if HAVE_TRAY |
70 | char *icon_theme; | 70 | char *icon_theme; |
71 | char *tray_bindings[10]; // mouse buttons 0-9 | 71 | char *tray_bindings[10]; // mouse buttons 0-9 |
72 | bool tray_hidden; | ||
72 | list_t *tray_outputs; // char * | 73 | list_t *tray_outputs; // char * |
73 | int tray_padding; | 74 | int tray_padding; |
74 | #endif | 75 | #endif |
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c index 19ecc5c1..a1169c20 100644 --- a/sway/commands/bar/tray_output.c +++ b/sway/commands/bar/tray_output.c | |||
@@ -31,8 +31,8 @@ struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { | |||
31 | } else { | 31 | } else { |
32 | wlr_log(WLR_DEBUG, "Showing tray on output '%s' for bar: %s", argv[0], | 32 | wlr_log(WLR_DEBUG, "Showing tray on output '%s' for bar: %s", argv[0], |
33 | config->current_bar->id); | 33 | config->current_bar->id); |
34 | list_add(outputs, strdup(argv[0])); | ||
35 | } | 34 | } |
35 | list_add(outputs, strdup(argv[0])); | ||
36 | 36 | ||
37 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 37 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
38 | #else | 38 | #else |
diff --git a/swaybar/bar.c b/swaybar/bar.c index 4fd9c488..7aed4dca 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
@@ -371,7 +371,9 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) { | |||
371 | assert(pointer->cursor_surface); | 371 | assert(pointer->cursor_surface); |
372 | 372 | ||
373 | #if HAVE_TRAY | 373 | #if HAVE_TRAY |
374 | bar->tray = create_tray(bar); | 374 | if (!bar->config->tray_hidden) { |
375 | bar->tray = create_tray(bar); | ||
376 | } | ||
375 | #endif | 377 | #endif |
376 | 378 | ||
377 | if (bar->config->workspace_buttons) { | 379 | if (bar->config->workspace_buttons) { |
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index df0586bf..8e7a542e 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -293,6 +293,7 @@ static bool ipc_parse_config( | |||
293 | json_object *o = json_object_array_get_idx(tray_outputs, i); | 293 | json_object *o = json_object_array_get_idx(tray_outputs, i); |
294 | list_add(config->tray_outputs, strdup(json_object_get_string(o))); | 294 | list_add(config->tray_outputs, strdup(json_object_get_string(o))); |
295 | } | 295 | } |
296 | config->tray_hidden = strcmp(config->tray_outputs->items[0], "none") == 0; | ||
296 | } | 297 | } |
297 | 298 | ||
298 | if ((json_object_object_get_ex(bar_config, "tray_padding", &tray_padding))) { | 299 | if ((json_object_object_get_ex(bar_config, "tray_padding", &tray_padding))) { |