AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove gtk_icon_paintable_download_texture() public API

Browse Source 
This allows us do do what we want internally, and anyway it didn't
really do what you'd expect anymore now that we do resizing during
rendering.
This commit is contained in:
Alexander Larsson 2020-02-06 17:14:44 +01:00
parent 6317fd3529
commit d45d604df1
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5011,7 +5011,6 @@ gtk_icon_theme_list_icons
gtk_icon_theme_get_icon_sizes
gtk_icon_paintable_get_filename
gtk_icon_paintable_is_symbolic
gtk_icon_paintable_download_texture
<SUBSECTION Standard>
GtkIconClass
GTK_ICON_THEME

17
gtk/gtkicontheme.c
View File

@ -2072,8 +2072,7 @@ choose_icon (GtkIconTheme *self,
*
* Looks up a named icon for a desired size and window scale, returning a
* #GtkIcon. The icon can then be rendered by using it as a #GdkPaintable,
* or you can get information such as the filename and size. The pixels
* of the texture can be access by using gtk_icon_paintable_download_texture().
* or you can get information such as the filename and size.
*
* If the available @icon_name is not available and @fallbacks are provided,
* they will be tried in order.
@ -3301,16 +3300,8 @@ icon_ensure_texture__locked (GtkIconPaintable *icon,
}
}
/**
* gtk_icon_paintable_download_texture:
* @self: a #GtkIcon
*
* Tries to access the pixels of an icon.
*
* Returns: (transfer full): An texture with the contents of the icon.
*/
GdkTexture *
gtk_icon_paintable_download_texture (GtkIconPaintable *self)
static GdkTexture *
gtk_icon_paintable_ensure_texture (GtkIconPaintable *self)
{
GdkTexture *texture = NULL;
@ -3401,7 +3392,7 @@ gtk_icon_paintable_snapshot_with_colors (GtkIconPaintable *icon,
double render_height;
gboolean symbolic;
texture = gtk_icon_paintable_download_texture (icon);
texture = gtk_icon_paintable_ensure_texture (icon);
symbolic = gtk_icon_paintable_is_symbolic (icon);
if (symbolic)

2
gtk/gtkicontheme.h
View File

@ -140,8 +140,6 @@ GDK_AVAILABLE_IN_ALL
const gchar * gtk_icon_paintable_get_filename (GtkIconPaintable *self);
GDK_AVAILABLE_IN_ALL
gboolean gtk_icon_paintable_is_symbolic (GtkIconPaintable *self);
GDK_AVAILABLE_IN_ALL
GdkTexture * gtk_icon_paintable_download_texture (GtkIconPaintable *self);
G_END_DECLS