alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaybar: free the right item during tray destruction

Browse source 
Also added a comment to make more obvious the reason for comparing
sni->status[0] == 'N'
This commit is contained in:
Ian Fan 2019-01-02 22:31:05 +00:00
parent 140bc2dd5b
commit b666fc76a6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
swaybar/tray/item.c
View file

@ -19,7 +19,7 @@
// TODO menu // TODO menu
static bool sni_ready(struct swaybar_sni *sni) { static bool sni_ready(struct swaybar_sni *sni) {
return sni->status && (sni->status[0] == 'N' ? return sni->status && (sni->status[0] == 'N' ? // NeedsAttention
sni->attention_icon_name || sni->attention_icon_pixmap : sni->attention_icon_name || sni->attention_icon_pixmap :
sni->icon_name || sni->icon_pixmap); sni->icon_name || sni->icon_pixmap);
} }
@ -396,7 +396,7 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
icon_size = actual_size < ideal_size ? icon_size = actual_size < ideal_size ?
actual_size*(ideal_size/actual_size) : ideal_size; actual_size*(ideal_size/actual_size) : ideal_size;
icon = cairo_image_surface_scale(sni->icon, icon_size, icon_size); icon = cairo_image_surface_scale(sni->icon, icon_size, icon_size);
} else { // draw a sad face } else { // draw a :(
icon_size = ideal_size*0.8; icon_size = ideal_size*0.8;
icon = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, icon_size, icon_size); icon = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, icon_size, icon_size);
cairo_t *cairo_icon = cairo_create(icon); cairo_t *cairo_icon = cairo_create(icon);

2
swaybar/tray/tray.c
View file

@ -79,7 +79,7 @@ void destroy_tray(struct swaybar_tray *tray) {
finish_host(&tray->host_xdg); finish_host(&tray->host_xdg);
finish_host(&tray->host_kde); finish_host(&tray->host_kde);
for (int i = 0; i < tray->items->length; ++i) { for (int i = 0; i < tray->items->length; ++i) {
destroy_sni(tray->items->items[0]); destroy_sni(tray->items->items[i]);
} }
list_free(tray->items); list_free(tray->items);
destroy_watcher(tray->watcher_xdg); destroy_watcher(tray->watcher_xdg);