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

I added a Windows-specific fallback to load custom menu icons directly from the installed share/icons/menu/<variant>/ path when GResource lookup doesn’t return an icon. This uses g_win32_get_package_installation_directory_of_module() plus g_build_filename() to avoid separator/path issues.

Browse Source 
The new fallback tries *.svg first, then *.png, so if resources aren’t available at runtime but files were installed, menu icons still render.
After that, the existing icon-name fallback chain still runs (custom_fallback_icon → stock mapping → stock name), so non-file-based fallback behavior is preserved.
This commit is contained in:
deepend
2026-02-17 22:03:51 -07:00
parent 9bdf654cbc
commit 329a641adf
1 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2201,11 +2201,46 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
custom_fallback_icon = "help-about";
}
if (!image && custom_icon)
{
#ifdef WIN32
char *base_path = g_win32_get_package_installation_directory_of_module (NULL);
if (base_path)
{
char *icons_menu_path = g_build_filename (base_path, "share", "icons", "menu", theme_variant, NULL);
char *filename = g_strconcat (custom_icon, ".svg", NULL);
char *icon_path = g_build_filename (icons_menu_path, filename, NULL);
if (g_file_test (icon_path, G_FILE_TEST_EXISTS))
image = gtk_image_new_from_file (icon_path);
g_free (icon_path);
g_free (filename);
if (!image)
{
filename = g_strconcat (custom_icon, ".png", NULL);
icon_path = g_build_filename (icons_menu_path, filename, NULL);
if (g_file_test (icon_path, G_FILE_TEST_EXISTS))
image = gtk_image_new_from_file (icon_path);
g_free (icon_path);
g_free (filename);
}
g_free (icons_menu_path);
g_free (base_path);
}
#endif
}
if (!image)
{
icon_name = gtkutil_icon_name_from_stock (stock_name);
if (!icon_name && custom_fallback_icon)
icon_name = custom_fallback_icon;
icon_name = custom_fallback_icon ? custom_fallback_icon : gtkutil_icon_name_from_stock (stock_name);
if (!icon_name)
icon_name = gtkutil_icon_name_from_stock (stock_name);
if (!icon_name)
icon_name = stock_name;
if (icon_name)