From 0340760e12829239078c0d21fa6d227561e30ff2 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Wed, 7 May 2025 16:57:54 +0800
Subject: [PATCH] Use load_symbolic for gtk icon instead of load_icon.

---
 include/util/gtk_icon.hpp |  4 +++-
 src/modules/sni/item.cpp  | 15 +++++++++------
 src/util/gtk_icon.cpp     | 15 ++++++++++++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/include/util/gtk_icon.hpp b/include/util/gtk_icon.hpp
index 44555f65..06f15abe 100644
--- a/include/util/gtk_icon.hpp
+++ b/include/util/gtk_icon.hpp
@@ -10,5 +10,7 @@ class DefaultGtkIconThemeWrapper {
 
  public:
   static bool has_icon(const std::string&);
-  static Glib::RefPtr<Gdk::Pixbuf> load_icon(const char*, int, Gtk::IconLookupFlags);
+  static Glib::RefPtr<Gdk::Pixbuf> load_icon(
+      const char*, int, Gtk::IconLookupFlags,
+      Glib::RefPtr<Gtk::StyleContext> style = Glib::RefPtr<Gtk::StyleContext>());
 };
diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp
index 9dc13158..407d7e72 100644
--- a/src/modules/sni/item.cpp
+++ b/src/modules/sni/item.cpp
@@ -388,14 +388,17 @@ Glib::RefPtr<Gdk::Pixbuf> Item::getIconPixbuf() {
 Glib::RefPtr<Gdk::Pixbuf> Item::getIconByName(const std::string& name, int request_size) {
   icon_theme->rescan_if_needed();
 
-  if (!icon_theme_path.empty() &&
-      icon_theme->lookup_icon(name.c_str(), request_size,
-                              Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE)) {
-    return icon_theme->load_icon(name.c_str(), request_size,
-                                 Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
+  if (!icon_theme_path.empty()) {
+    auto icon_info = icon_theme->lookup_icon(name.c_str(), request_size,
+                                             Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
+    if (icon_info) {
+      bool is_sym = false;
+      return icon_info.load_symbolic(event_box.get_style_context(), is_sym);
+    }
   }
   return DefaultGtkIconThemeWrapper::load_icon(name.c_str(), request_size,
-                                               Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
+                                               Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE,
+                                               event_box.get_style_context());
 }
 
 double Item::getScaledIconSize() {
diff --git a/src/util/gtk_icon.cpp b/src/util/gtk_icon.cpp
index 5dd741f9..4b4d3d69 100644
--- a/src/util/gtk_icon.cpp
+++ b/src/util/gtk_icon.cpp
@@ -15,11 +15,20 @@ bool DefaultGtkIconThemeWrapper::has_icon(const std::string& value) {
   return Gtk::IconTheme::get_default()->has_icon(value);
 }
 
-Glib::RefPtr<Gdk::Pixbuf> DefaultGtkIconThemeWrapper::load_icon(const char* name, int tmp_size,
-                                                                Gtk::IconLookupFlags flags) {
+Glib::RefPtr<Gdk::Pixbuf> DefaultGtkIconThemeWrapper::load_icon(
+    const char* name, int tmp_size, Gtk::IconLookupFlags flags,
+    Glib::RefPtr<Gtk::StyleContext> style) {
   const std::lock_guard<std::mutex> lock(default_theme_mutex);
 
   auto default_theme = Gtk::IconTheme::get_default();
   default_theme->rescan_if_needed();
-  return default_theme->load_icon(name, tmp_size, flags);
+
+  auto icon_info = default_theme->lookup_icon(name, tmp_size, flags);
+
+  if (style.get() == nullptr) {
+    return icon_info.load_icon();
+  }
+
+  bool is_sym = false;
+  return icon_info.load_symbolic(style, is_sym);
 }