1 files changed, 8 insertions, 4 deletions

diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c
index 0cb5ee9d..ca6c03ad 100644
--- a/swaybar/tray/item.c
+++ b/swaybar/tray/item.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <arpa/inet.h>
 #include <cairo.h>
 #include <limits.h>
@@ -7,12 +6,12 @@
 #include <string.h>
 #include "swaybar/bar.h"
 #include "swaybar/config.h"
+#include "swaybar/image.h"
 #include "swaybar/input.h"
 #include "swaybar/tray/host.h"
 #include "swaybar/tray/icon.h"
 #include "swaybar/tray/item.h"
 #include "swaybar/tray/tray.h"
-#include "background-image.h"
 #include "cairo_util.h"
 #include "list.h"
 #include "log.h"
@@ -385,13 +384,18 @@ static int cmp_sni_id(const void *item, const void *cmp_to) {
 
 static enum hotspot_event_handling icon_hotspot_callback(
                 struct swaybar_output *output, struct swaybar_hotspot *hotspot,
-                double x, double y, uint32_t button, void *data) {
+                double x, double y, uint32_t button, bool released, void *data) {
         sway_log(SWAY_DEBUG, "Clicked on %s", (char *)data);
 
         struct swaybar_tray *tray = output->bar->tray;
         int idx = list_seq_find(tray->items, cmp_sni_id, data);
 
         if (idx != -1) {
+                if (released) {
+                        // Since we handle the pressed event, also handle the released event
+                        // to block it from falling through to a binding in the bar
+                        return HOTSPOT_IGNORE;
+                }
                 struct swaybar_sni *sni = tray->items->items[idx];
                 // guess global position since wayland doesn't expose it
                 struct swaybar_config *config = tray->bar->config;
@@ -426,7 +430,7 @@ static void reload_sni(struct swaybar_sni *sni, char *icon_theme,
                 list_free(icon_search_paths);
                 if (icon_path) {
                         cairo_surface_destroy(sni->icon);
-                        sni->icon = load_background_image(icon_path);
+                        sni->icon = load_image(icon_path);
                         free(icon_path);
                         return;
                 }