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

Added stronger icon fallback handling for zc-menu-* menu items (including Server dropdown icons and Preferences) by introducing alternate fallback icon names and choosing an alternate only when the primary fallback icon is unavailable in the active icon theme. This specifically improves connect, disconnect, join, and preferences cases on Windows theme variations.

Browse Source 
Kept the custom resource/file loading path in place (resource SVG + installed file fallback), then layered the improved theme fallback selection after it so menu icons still resolve if resource decoding is unavailable.

Added emoji entry fallback logic: if GTK’s built-in show-emoji-icon leaves the secondary icon empty, the input box now picks the first available icon from a fallback list (face-smile-symbolic, face-smile, insert-emoticon-symbolic, insert-emoticon)
This commit is contained in:
deepend
2026-02-17 23:12:34 -07:00
parent e316413f60
commit 335a8f4d6b
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2135,6 +2135,10 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
const char *theme_variant = "light";
char *resource_path;
const char *custom_fallback_icon = NULL;
<<<<<<< ours
=======
const char *custom_alt_fallback_icon = NULL;
>>>>>>> theirs
GdkPixbuf *custom_pixbuf = NULL;
#endif
#if !HAVE_GTK3
@@ -2188,15 +2192,27 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
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";
{
custom_fallback_icon = "network-disconnect";
custom_alt_fallback_icon = "network-offline";
}
else if (g_str_equal (custom_icon, "connect"))
custom_fallback_icon = "network-transmit-receive";
{
custom_fallback_icon = "network-connect";
custom_alt_fallback_icon = "network-transmit-receive";
}
else if (g_str_equal (custom_icon, "join"))
{
custom_fallback_icon = "list-add";
custom_alt_fallback_icon = "go-jump";
}
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";
custom_alt_fallback_icon = "preferences-desktop";
}
else if (g_str_equal (custom_icon, "clear"))
custom_fallback_icon = "edit-clear";
else if (g_str_equal (custom_icon, "save"))
@@ -2260,9 +2276,18 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
if (!image)
{
GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
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_theme && custom_alt_fallback_icon && icon_name && !gtk_icon_theme_has_icon (icon_theme, icon_name)
&& gtk_icon_theme_has_icon (icon_theme, custom_alt_fallback_icon))
{
icon_name = custom_alt_fallback_icon;
}
if (!icon_name)
icon_name = stock_name;
if (icon_name)