mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-04 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix icon.c and tray/tray.c rendering

Browse source
This commit is contained in:
Calvin Lee 2018-04-03 20:39:04 -06:00
parent a568637a45
commit 339149807f
5 changed files with 70 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
swaybar/render.c
View file

@ -13,6 +13,9 @@
#include "swaybar/ipc.h"
#include "swaybar/render.h"
#include "swaybar/status_line.h"
#ifdef ENABLE_TRAY
#include "swaybar/tray/tray.h"
#endif
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
static const int ws_horizontal_padding = 5;
@ -410,6 +413,9 @@ static uint32_t render_to_cairo(cairo_t *cairo,
max_height = h > max_height ? h : max_height;
}
x = output->width;
#ifdef ENABLE_TRAY
render_tray(cairo, output, config, &x, output->height);
#endif
if (bar->status) {
uint32_t h = render_status_line(cairo, config, output, bar->status,
output->focused, &x, output->width, output->height);
@ -420,7 +426,7 @@ static uint32_t render_to_cairo(cairo_t *cairo,
}
void render_frame(struct swaybar *bar, struct swaybar_output *output) {
struct swaybar_hotspot *hotspot, *tmp;
struct swaybar_hotspot *hotspot, *tmp;
wl_list_for_each_safe(hotspot, tmp, &output->hotspots, link) {
if (hotspot->destroy) {
hotspot->destroy(hotspot->data);