Commit df53e6ad authored by Bastien Nocera's avatar Bastien Nocera

Add ability to set a tooltip's image from a GIcon

Makes it easier to implement fallbacks whilst following
theme changes.

https://bugzilla.gnome.org/show_bug.cgi?id=598261
parent 588bec91
......@@ -4445,6 +4445,7 @@ gtk_tooltip_set_text
gtk_tooltip_set_icon
gtk_tooltip_set_icon_from_stock
gtk_tooltip_set_icon_from_icon_name
gtk_tooltip_set_icon_from_gicon
gtk_tooltip_set_custom
gtk_tooltip_trigger_tooltip_query
gtk_tooltip_set_tip_area
......
......@@ -4408,6 +4408,7 @@ gtk_tooltip_set_custom
gtk_tooltip_set_icon
gtk_tooltip_set_icon_from_stock
gtk_tooltip_set_icon_from_icon_name
gtk_tooltip_set_icon_from_gicon
gtk_tooltip_set_markup
gtk_tooltip_set_text
gtk_tooltip_set_tip_area
......
......@@ -318,9 +318,9 @@ gtk_tooltip_set_icon_from_stock (GtkTooltip *tooltip,
* Since: 2.14
*/
void
gtk_tooltip_set_icon_from_icon_name(GtkTooltip *tooltip,
const gchar *icon_name,
GtkIconSize size)
gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip,
const gchar *icon_name,
GtkIconSize size)
{
g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
......@@ -332,6 +332,32 @@ gtk_tooltip_set_icon_from_icon_name(GtkTooltip *tooltip,
gtk_widget_hide (tooltip->image);
}
/**
* gtk_tooltip_set_from_gicon:
* @tooltip: a #GtkTooltip
* @gicon: a #GIcon representing the icon, or %NULL
* @size: a stock icon size
* Sets the icon of the tooltip (which is in front of the text) to be
* the icon indicated by @gicon with the size indicated
* by @size. If @icon_name is %NULL, the image will be hidden.
*
* Since: 2.20
*/
void
gtk_tooltip_set_icon_from_gicon (GtkTooltip *tooltip,
GIcon *gicon,
GtkIconSize size)
{
g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
gtk_image_set_from_gicon (GTK_IMAGE (tooltip->image), gicon, size);
if (gicon)
gtk_widget_show (tooltip->image);
else
gtk_widget_hide (tooltip->image);
}
/**
* gtk_tooltip_set_custom:
* @tooltip: a #GtkTooltip
......
......@@ -48,6 +48,9 @@ void gtk_tooltip_set_icon_from_stock (GtkTooltip *tooltip,
void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip,
const gchar *icon_name,
GtkIconSize size);
void gtk_tooltip_set_icon_from_gicon (GtkTooltip *tooltip,
GIcon *gicon,
GtkIconSize size);
void gtk_tooltip_set_custom (GtkTooltip *tooltip,
GtkWidget *custom_widget);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment