AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Add gtk_icon_paintable_get_resource_path()

Browse Source 
Also, return NULL from gtk_icon_paintable_get_filename() if the path
is really a resource path.
This commit is contained in:
Alexander Larsson 2020-02-06 17:33:19 +01:00
parent 57ecb2829a
commit a772bf7517
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gtk/gtk4-sections.txt
View File

@ -5010,6 +5010,7 @@ gtk_icon_theme_lookup_by_gicon
gtk_icon_theme_list_icons
gtk_icon_theme_get_icon_sizes
gtk_icon_paintable_get_filename
gtk_icon_paintable_get_resource_path
gtk_icon_paintable_get_icon_name
gtk_icon_paintable_is_symbolic
<SUBSECTION Standard>

23
gtk/gtkicontheme.c
View File

@ -3130,7 +3130,28 @@ gtk_icon_paintable_get_filename (GtkIconPaintable *icon)
{
g_return_val_if_fail (icon != NULL, NULL);
return icon->filename;
if (!icon->is_resource)
return icon->filename;
return NULL;
}
/**
* gtk_icon_paintable_get_resource_path:
* @self: a #GtkIcon
*
* Gets the resource path for the icon.
*
* Returns: (nullable) (type filename): the resource for the icon, or %NULL
* if the icon is not represented by a resource.
*/
const gchar *
gtk_icon_paintable_get_resource_path (GtkIconPaintable *icon)
{
g_return_val_if_fail (icon != NULL, NULL);
if (icon->is_resource)
return icon->filename;
return NULL;
}
/**

8
gtk/gtkicontheme.h
View File

@ -137,11 +137,13 @@ GDK_AVAILABLE_IN_ALL
GType gtk_icon_paintable_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
const gchar * gtk_icon_paintable_get_filename (GtkIconPaintable *self);
const gchar * gtk_icon_paintable_get_filename (GtkIconPaintable *self);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_icon_paintable_get_icon_name (GtkIconPaintable *self);
const gchar * gtk_icon_paintable_get_resource_path (GtkIconPaintable *self);
GDK_AVAILABLE_IN_ALL
gboolean gtk_icon_paintable_is_symbolic (GtkIconPaintable *self);
const gchar * gtk_icon_paintable_get_icon_name (GtkIconPaintable *self);
GDK_AVAILABLE_IN_ALL
gboolean gtk_icon_paintable_is_symbolic (GtkIconPaintable *self);
G_END_DECLS