diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-11-14 19:43:13 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-11-15 14:22:17 -0500 |
| commit | dbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b (patch) | |
| tree | a76a5be1cac5ef746c431a00e8b79a93b63f3e10 /gtk/gtktoolbutton.c | |
| parent | 049cc6aa013601c4e662c38df408f8956b155f0a (diff) | |
| download | gtk+-dbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b.tar.gz | |
image: Remove icon-size argument from icon setters
Instead, add a function gtk_image_set_icon_size() for the cases where
overriding the icon size is necessary.
Treat icon sizes the same way as pixel sizes, too. So gtk_image_clear()
no longer unsets the icon size.
Diffstat (limited to 'gtk/gtktoolbutton.c')
| -rw-r--r-- | gtk/gtktoolbutton.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 90d7066a90..a1006747bc 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -460,7 +460,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) } else if (button->priv->icon_name) { - icon = gtk_image_new_from_icon_name (button->priv->icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); + icon = gtk_image_new_from_icon_name (button->priv->icon_name); } if (icon) @@ -713,13 +713,13 @@ clone_image_menu_size (GtkImage *image) { const gchar *icon_name = gtk_image_get_icon_name (image); - return gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + return gtk_image_new_from_icon_name (icon_name); } else if (storage_type == GTK_IMAGE_GICON) { GIcon *icon = gtk_image_get_gicon (image); - return gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU); + return gtk_image_new_from_gicon (icon); } else if (storage_type == GTK_IMAGE_SURFACE) { |