diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-12-31 15:43:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 15:43:23 -0500 |
| commit | 3d7c20f062bebe39199d3872e5b64d5e8d61d100 (patch) | |
| tree | 93b8ddb51873cae14db8d5f07db74ca96236f184 /swaybar/render.c | |
| parent | 4a3ada303b948ce2bdf21c7e6254005c85b000ea (diff) | |
| parent | 9e31f5d79ce9de8f1c73013b792aa94f355a1983 (diff) | |
Merge pull request #3249 from ianyfan/tray
Swaybar tray
Diffstat (limited to 'swaybar/render.c')
| -rw-r--r-- | swaybar/render.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/swaybar/render.c b/swaybar/render.c index 96118c42..9fe4ee9c 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -14,6 +14,9 @@ #include "swaybar/ipc.h" #include "swaybar/render.h" #include "swaybar/status_line.h" +#if HAVE_TRAY +#include "swaybar/tray/tray.h" +#endif #include "wlr-layer-shell-unstable-v1-client-protocol.h" static const int WS_HORIZONTAL_PADDING = 5; @@ -453,6 +456,12 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) { * utilize the available space. */ double x = output->width * output->scale; +#if HAVE_TRAY + if (bar->tray) { + uint32_t h = render_tray(cairo, output, &x); + max_height = h > max_height ? h : max_height; + } +#endif if (bar->status) { uint32_t h = render_status_line(cairo, output, &x); max_height = h > max_height ? h : max_height; |