diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-12-11 16:27:39 +0000 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-12-31 20:40:18 +0000 |
commit | f33b5c5223a3eb8b63ff4361f43b82ad2104e84b (patch) | |
tree | 191bb88354f56ac4f3ccc4740ebad05c5d42bff5 /swaybar | |
parent | swaybar: set bar dirty on SNI event (diff) | |
download | sway-f33b5c5223a3eb8b63ff4361f43b82ad2104e84b.tar.gz sway-f33b5c5223a3eb8b63ff4361f43b82ad2104e84b.tar.zst sway-f33b5c5223a3eb8b63ff4361f43b82ad2104e84b.zip |
swaybar: do not create tray if hidden
Diffstat (limited to 'swaybar')
-rw-r--r-- | swaybar/bar.c | 4 | ||||
-rw-r--r-- | swaybar/ipc.c | 1 |
2 files changed, 4 insertions, 1 deletions
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))) { |