mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-10 16:00:18 +00:00
Updated channel list icon button creation to always use gtkutil_image_new_from_stock(..., GTK_ICON_SIZE_MENU) so it follows the same zc-menu-* icon resolution path on all GTK targets instead of mixing direct stock-image calls.
Updated the GTK2 channel list context-menu icon path to use the same helper, removing direct gtk_image_new_from_stock usage for menu icons.
Updated the GTK2 spell-entry popup icon path to use gtkutil_image_new_from_stock, aligning it with the same menu icon set/mapping pipeline used elsewhere (data/icons/menu).
This commit is contained in:
@@ -122,11 +122,7 @@ chanlist_icon_button (const char *label, const char *icon_name,
|
||||
GtkWidget *image;
|
||||
|
||||
button = gtk_button_new_with_mnemonic (label);
|
||||
#if HAVE_GTK3
|
||||
image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
|
||||
#elif !HAVE_GTK3
|
||||
image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
|
||||
#endif
|
||||
gtk_button_set_image (GTK_BUTTON (button), image);
|
||||
gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
|
||||
g_signal_connect (G_OBJECT (button), "clicked", callback, userdata);
|
||||
@@ -157,7 +153,7 @@ chanlist_icon_menu_item (const char *label, const char *icon_name,
|
||||
GtkWidget *image;
|
||||
|
||||
item = gtk_image_menu_item_new_with_mnemonic (label);
|
||||
image = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
|
||||
image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
|
||||
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
|
||||
#endif
|
||||
g_signal_connect (G_OBJECT (item), "activate", callback, userdata);
|
||||
|
||||
@@ -740,7 +740,7 @@ sexy_spell_entry_icon_menu_item (const char *label, const char *stock_name)
|
||||
GtkWidget *image;
|
||||
|
||||
item = gtk_image_menu_item_new_with_label (label);
|
||||
image = gtk_image_new_from_stock (stock_name, GTK_ICON_SIZE_MENU);
|
||||
image = gtkutil_image_new_from_stock (stock_name, GTK_ICON_SIZE_MENU);
|
||||
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user