AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

tooltips: Make icon a paintable

Browse Source
This commit is contained in:
Benjamin Otte 2018-03-16 03:38:50 +01:00
parent d1be2b29cf
commit bcf1aa7cb2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtktooltip.c
View File

@ -264,19 +264,19 @@ gtk_tooltip_set_text (GtkTooltip *tooltip,
/** /**
* gtk_tooltip_set_icon: * gtk_tooltip_set_icon:
* @tooltip: a #GtkTooltip * @tooltip: a #GtkTooltip
* @texture: (allow-none): a #GdkTexture, or %NULL * @paintable: (allow-none): a #GdkPaintable, or %NULL
* *
* Sets the icon of the tooltip (which is in front of the text) to be * Sets the icon of the tooltip (which is in front of the text) to be
* @texture. If @texure is %NULL, the image will be hidden. * @paintable. If @paintable is %NULL, the image will be hidden.
*/ */
void void
gtk_tooltip_set_icon (GtkTooltip *tooltip, gtk_tooltip_set_icon (GtkTooltip *tooltip,
GdkTexture *texture) GdkPaintable *paintable)
{ {
g_return_if_fail (GTK_IS_TOOLTIP (tooltip)); g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
g_return_if_fail (texture == NULL || GDK_IS_TEXTURE (texture)); g_return_if_fail (paintable == NULL || GDK_IS_PAINTABLE (paintable));
gtk_tooltip_window_set_image_icon (GTK_TOOLTIP_WINDOW (tooltip->window), texture); gtk_tooltip_window_set_image_icon (GTK_TOOLTIP_WINDOW (tooltip->window), paintable);
} }
/** /**

2
gtk/gtktooltip.h
View File

@ -43,7 +43,7 @@ void gtk_tooltip_set_text (GtkTooltip *tooltip,
const gchar *text); const gchar *text);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_tooltip_set_icon (GtkTooltip *tooltip, void gtk_tooltip_set_icon (GtkTooltip *tooltip,
GdkTexture *texture); GdkPaintable *paintable);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip, void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip,
const gchar *icon_name); const gchar *icon_name);

6
gtk/gtktooltipwindow.c
View File

@ -121,12 +121,12 @@ gtk_tooltip_window_set_label_text (GtkTooltipWindow *window,
void void
gtk_tooltip_window_set_image_icon (GtkTooltipWindow *window, gtk_tooltip_window_set_image_icon (GtkTooltipWindow *window,
GdkTexture *texture) GdkPaintable *paintable)
{ {
if (texture != NULL) if (paintable != NULL)
{ {
gtk_image_set_from_texture (GTK_IMAGE (window->image), texture); gtk_image_set_from_paintable (GTK_IMAGE (window->image), paintable);
gtk_widget_show (window->image); gtk_widget_show (window->image);
} }
else else

2
gtk/gtktooltipwindowprivate.h
View File

@ -42,7 +42,7 @@ void gtk_tooltip_window_set_label_markup (GtkTooltipWindo
void gtk_tooltip_window_set_label_text (GtkTooltipWindow *window, void gtk_tooltip_window_set_label_text (GtkTooltipWindow *window,
const char *text); const char *text);
void gtk_tooltip_window_set_image_icon (GtkTooltipWindow *window, void gtk_tooltip_window_set_image_icon (GtkTooltipWindow *window,
GdkTexture *texture); GdkPaintable *paintable);
void gtk_tooltip_window_set_image_icon_from_name (GtkTooltipWindow *window, void gtk_tooltip_window_set_image_icon_from_name (GtkTooltipWindow *window,
const char *icon_name); const char *icon_name);
void gtk_tooltip_window_set_image_icon_from_gicon (GtkTooltipWindow *window, void gtk_tooltip_window_set_image_icon_from_gicon (GtkTooltipWindow *window,