deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-22 13:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed GTK3 menu icon fallback handling so Windows no longer falls through to non-standard zc-menu-* icon IDs (which show as placeholders in many setups). The code now maps each custom menu icon key (new, connect, disconnect, save, help, etc.) to a concrete freedesktop icon name before calling gtk_image_new_from_icon_name().

Browse Source 
Kept the existing preferred behavior intact: load bundled SVG menu icons from GResource first (light/dark variant), and only use fallback icon names when those resources are unavailable.
This commit is contained in:
deepend
2026-02-17 21:19:22 -07:00
parent 0a5c95c6b4
commit afc490aa18
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/fe-gtk/menu.c
View File

@@ -2134,6 +2134,7 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
char *theme_name_lower = NULL; char *theme_name_lower = NULL;
const char *theme_variant = "light"; const char *theme_variant = "light";
char *resource_path; char *resource_path;
const char *custom_fallback_icon = NULL;
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3
GtkWidget *img; GtkWidget *img;
@@ -2166,9 +2167,45 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
g_free (theme_name); g_free (theme_name);
} }
if (custom_icon)
{
if (g_str_equal (custom_icon, "new"))
custom_fallback_icon = "document-new";
else if (g_str_equal (custom_icon, "load-plugin"))
custom_fallback_icon = "document-open";
else if (g_str_equal (custom_icon, "detach"))
custom_fallback_icon = "view-restore";
else if (g_str_equal (custom_icon, "close"))
custom_fallback_icon = "window-close";
else if (g_str_equal (custom_icon, "quit"))
custom_fallback_icon = "application-exit";
else if (g_str_equal (custom_icon, "disconnect"))
custom_fallback_icon = "network-offline";
else if (g_str_equal (custom_icon, "connect"))
custom_fallback_icon = "network-transmit-receive";
else if (g_str_equal (custom_icon, "join"))
custom_fallback_icon = "list-add";
else if (g_str_equal (custom_icon, "chanlist"))
custom_fallback_icon = "view-list";
else if (g_str_equal (custom_icon, "preferences"))
custom_fallback_icon = "preferences-system";
else if (g_str_equal (custom_icon, "clear"))
custom_fallback_icon = "edit-clear";
else if (g_str_equal (custom_icon, "save"))
custom_fallback_icon = "document-save";
else if (g_str_equal (custom_icon, "search") || g_str_equal (custom_icon, "find"))
custom_fallback_icon = "edit-find";
else if (g_str_equal (custom_icon, "help"))
custom_fallback_icon = "help-browser";
else if (g_str_equal (custom_icon, "about"))
custom_fallback_icon = "help-about";
}
if (!image) if (!image)
{ {
icon_name = gtkutil_icon_name_from_stock (stock_name); icon_name = gtkutil_icon_name_from_stock (stock_name);
if (!icon_name && custom_fallback_icon)
icon_name = custom_fallback_icon;
if (!icon_name) if (!icon_name)
icon_name = stock_name; icon_name = stock_name;
if (icon_name) if (icon_name)