aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgnidorah <gnidorah@users.noreply.github.com>2017-11-22 09:04:46 +0300
committerCalvin Lee <cyrus296@gmail.com>2017-12-29 12:11:51 -0700
commit4d34bc393e7b144fbc105537f17bee329c44814d (patch)
treeed17f848e7ac95c919d23424671a8a8ad5651a86
parent87a55dfe5cd6805906fc08f3f03083a2649e84a0 (diff)
downloadsway-4d34bc393e7b144fbc105537f17bee329c44814d.zip
sway-4d34bc393e7b144fbc105537f17bee329c44814d.tar.gz
sway-4d34bc393e7b144fbc105537f17bee329c44814d.tar.bz2
Keep tray separate
-rw-r--r--include/swaybar/bar.h2
-rw-r--r--swaybar/bar.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 96c4365..7ec09e3 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -29,7 +29,9 @@ struct output {
char *name;
int idx;
bool focused;
+#ifdef ENABLE_TRAY
bool active;
+#endif
};
struct workspace {
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 49a698b..f1b42d2 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -295,12 +295,14 @@ void bar_run(struct bar *bar) {
for (i = 0; i < bar->outputs->length; ++i) {
struct output *output = bar->outputs->items[i];
if (window_prerender(output->window) && output->window->cairo) {
- output->active = true;
render(output, bar->config, bar->status);
window_render(output->window);
wl_display_flush(output->registry->display);
+#ifdef ENABLE_TRAY
+ output->active = true;
} else {
output->active = false;
+#endif
}
}
}