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

image: Change getters

Browse Source 
Instead of returning the icon size with them, make
gtk_image_get_icon_name() and gtk_image_get_gicon() only return the icon
itself.

As a benefit, we can turn them into regular getters that return values
instead of requiring out parameters.

Instead, provide gtk_image_get_icon_size() to query the icon size.
This commit is contained in:
Benjamin Otte 2017-01-22 22:58:45 +01:00 committed by Matthias Clasen
parent f53b72e5ff
commit 049cc6aa01
14 changed files with 56 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/gtk-demo/clipboard.c
View File

@ -68,7 +68,6 @@ static cairo_surface_t *
get_image_surface (GtkImage *image)
{
const gchar *icon_name;
GtkIconSize size;
GtkIconTheme *icon_theme;
int width;
@ -77,7 +76,7 @@ get_image_surface (GtkImage *image)
case GTK_IMAGE_SURFACE:
return cairo_surface_reference (gtk_image_get_surface (image));
case GTK_IMAGE_ICON_NAME:
gtk_image_get_icon_name (image, &icon_name, &size);
icon_name = gtk_image_get_icon_name (image);
icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
gtk_icon_size_lookup (size, &width, NULL);
return gtk_icon_theme_load_surface (icon_theme, icon_name, width, 1, NULL, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);

2
demos/icon-browser/iconbrowserwin.c
View File

@ -390,7 +390,7 @@ get_image_data (GtkWidget *widget,
image = gtk_bin_get_child (GTK_BIN (widget));
gtk_image_get_icon_name (GTK_IMAGE (image), &name, NULL);
name = gtk_image_get_icon_name (GTK_IMAGE (image));
size = gtk_image_get_pixel_size (GTK_IMAGE (image));
pixbuf = get_icon (image, name, size);

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

@ -1509,6 +1509,7 @@ gtk_image_clear
gtk_image_new
gtk_image_set_pixel_size
gtk_image_get_pixel_size
gtk_image_get_icon_size
<SUBSECTION Standard>
GTK_IMAGE
GTK_IS_IMAGE

7
gtk/a11y/gtkimageaccessible.c
View File

@ -192,17 +192,14 @@ gtk_image_accessible_get_name (AtkObject *accessible)
if (storage_type == GTK_IMAGE_ICON_NAME)
{
const gchar *icon_name;
gtk_image_get_icon_name (image, &icon_name, NULL);
image_accessible->priv->stock_name = name_from_icon_name (icon_name);
image_accessible->priv->stock_name = name_from_icon_name (gtk_image_get_icon_name (image));
}
else if (storage_type == GTK_IMAGE_GICON)
{
GIcon *icon;
const gchar * const *icon_names;
gtk_image_get_gicon (image, &icon, NULL);
icon = gtk_image_get_gicon (image);
if (G_IS_THEMED_ICON (icon))
{
icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));

14
gtk/gtkaboutdialog.c
View File

@ -961,12 +961,7 @@ gtk_about_dialog_get_property (GObject *object,
break;
case PROP_LOGO_ICON_NAME:
if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
{
const gchar *icon_name;
gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
g_value_set_string (value, icon_name);
}
g_value_set_string (value, gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image)));
else
g_value_set_string (value, NULL);
break;
@ -1862,16 +1857,15 @@ const gchar *
gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
{
GtkAboutDialogPrivate *priv;
const gchar *icon_name = NULL;
g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
priv = about->priv;
if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) != GTK_IMAGE_ICON_NAME)
return NULL;
return icon_name;
return gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image));
}
/**

4
gtk/gtkbutton.c
View File

@ -1139,11 +1139,9 @@ gtk_button_get_icon_name (GtkButton *button)
if (priv->child_type == ICON_CHILD)
{
const char *icon_name;
GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
gtk_image_get_icon_name (GTK_IMAGE (child), &icon_name, NULL);
return icon_name;
return gtk_image_get_icon_name (GTK_IMAGE (child));
}
return NULL;

60
gtk/gtkimage.c
View File

@ -1053,42 +1053,30 @@ gtk_image_get_texture (GtkImage *image)
/**
* gtk_image_get_icon_name:
* @image: a #GtkImage
* @icon_name: (out) (transfer none) (allow-none): place to store an
* icon name, or %NULL
* @size: (out) (allow-none) (type int): place to store an icon size
* (#GtkIconSize), or %NULL
*
* Gets the icon name and size being displayed by the #GtkImage.
* The storage type of the image must be %GTK_IMAGE_EMPTY or
* %GTK_IMAGE_ICON_NAME (see gtk_image_get_storage_type()).
* The returned string is owned by the #GtkImage and should not
* be freed.
*
*
* Returns: (transfer none) (allow-none): the icon name, or %NULL
*
* Since: 2.6
**/
void
gtk_image_get_icon_name (GtkImage *image,
const gchar **icon_name,
GtkIconSize *size)
const gchar *
gtk_image_get_icon_name (GtkImage *image)
{
GtkImagePrivate *priv = gtk_image_get_instance_private (image);
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_val_if_fail (GTK_IS_IMAGE (image), NULL);
if (icon_name)
*icon_name = _gtk_icon_helper_get_icon_name (&priv->icon_helper);
if (size)
*size = _gtk_icon_helper_get_icon_size (&priv->icon_helper);
return _gtk_icon_helper_get_icon_name (&priv->icon_helper);
}
/**
* gtk_image_get_gicon:
* @image: a #GtkImage
* @gicon: (out) (transfer none) (allow-none): place to store a
* #GIcon, or %NULL
* @size: (out) (allow-none) (type int): place to store an icon size
* (#GtkIconSize), or %NULL
*
* Gets the #GIcon and size being displayed by the #GtkImage.
* The storage type of the image must be %GTK_IMAGE_EMPTY or
@ -1096,22 +1084,18 @@ gtk_image_get_icon_name (GtkImage *image,
* The caller of this function does not own a reference to the
* returned #GIcon.
*
* Returns: (transfer none) (allow-none): a #GIcon, or %NULL
*
* Since: 2.14
**/
void
gtk_image_get_gicon (GtkImage *image,
GIcon **gicon,
GtkIconSize *size)
GIcon *
gtk_image_get_gicon (GtkImage *image)
{
GtkImagePrivate *priv = gtk_image_get_instance_private (image);
g_return_if_fail (GTK_IS_IMAGE (image));
g_return_val_if_fail (GTK_IS_IMAGE (image), NULL);
if (gicon)
*gicon = _gtk_icon_helper_peek_gicon (&priv->icon_helper);
if (size)
*size = _gtk_icon_helper_get_icon_size (&priv->icon_helper);
return _gtk_icon_helper_peek_gicon (&priv->icon_helper);
}
/**
@ -1396,3 +1380,21 @@ gtk_image_get_pixel_size (GtkImage *image)
return _gtk_icon_helper_get_pixel_size (&priv->icon_helper);
}
/**
* gtk_image_get_icon_size:
* @image: a #GtkImage
*
* Gets the icon size used by the @image when rendering icons.
*
* Returns: the image size used by icons
*
* Since: 3.90
**/
GtkIconSize
gtk_image_get_icon_size (GtkImage *image)
{
g_return_val_if_fail (GTK_IS_IMAGE (image), GTK_ICON_SIZE_INVALID);
return _gtk_icon_helper_get_icon_size (image->priv->icon_helper);
}

10
gtk/gtkimage.h
View File

@ -159,15 +159,13 @@ GDK_AVAILABLE_IN_3_94
GdkTexture *gtk_image_get_texture (GtkImage *image);
GDK_AVAILABLE_IN_ALL
void gtk_image_get_icon_name (GtkImage *image,
const gchar **icon_name,
GtkIconSize *size);
const char *gtk_image_get_icon_name (GtkImage *image);
GDK_AVAILABLE_IN_ALL
void gtk_image_get_gicon (GtkImage *image,
GIcon **gicon,
GtkIconSize *size);
GIcon * gtk_image_get_gicon (GtkImage *image);
GDK_AVAILABLE_IN_ALL
gint gtk_image_get_pixel_size (GtkImage *image);
GDK_AVAILABLE_IN_3_94
GtkIconSize gtk_image_get_icon_size (GtkImage *image);
G_END_DECLS

6
gtk/gtkmodelbutton.c
View File

@ -496,11 +496,7 @@ gtk_model_button_get_property (GObject *object,
break;
case PROP_ICON:
{
GIcon *icon;
gtk_image_get_gicon (GTK_IMAGE (button->image), &icon, NULL);
g_value_set_object (value, icon);
}
g_value_set_object (value, gtk_image_get_gicon (GTK_IMAGE (button->image)));
break;
case PROP_TEXT:

2
gtk/gtkmodelmenuitem.c
View File

@ -213,7 +213,7 @@ gtk_model_menu_item_get_icon (GtkModelMenuItem *item)
{
if (GTK_IS_IMAGE (l->data))
{
gtk_image_get_gicon (GTK_IMAGE (l->data), &icon, NULL);
icon = gtk_image_get_gicon (GTK_IMAGE (l->data));
break;
}
}

5
gtk/gtkplacesviewrow.c
View File

@ -214,16 +214,13 @@ gtk_places_view_row_get_property (GObject *object,
GParamSpec *pspec)
{
GtkPlacesViewRow *self;
GIcon *icon;
self = GTK_PLACES_VIEW_ROW (object);
icon = NULL;
switch (prop_id)
{
case PROP_ICON:
gtk_image_get_gicon (self->icon_image, &icon, NULL);
g_value_set_object (value, icon);
g_value_set_object (value, gtk_image_get_gicon (self->icon_image));
break;
case PROP_NAME:

7
gtk/gtkshortcutsshortcut.c
View File

@ -369,12 +369,7 @@ gtk_shortcuts_shortcut_get_property (GObject *object,
break;
case PROP_ICON:
{
GIcon *icon;
gtk_image_get_gicon (self->image, &icon, NULL);
g_value_set_object (value, icon);
}
g_value_set_object (value, gtk_image_get_gicon (self->image));
break;
case PROP_ICON_SET:

8
gtk/gtktoolbutton.c
View File

@ -711,14 +711,14 @@ clone_image_menu_size (GtkImage *image)
if (storage_type == GTK_IMAGE_ICON_NAME)
{
const gchar *icon_name;
gtk_image_get_icon_name (image, &icon_name, NULL);
const gchar *icon_name = gtk_image_get_icon_name (image);
return gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
}
else if (storage_type == GTK_IMAGE_GICON)
{
GIcon *icon;
gtk_image_get_gicon (image, &icon, NULL);
GIcon *icon = gtk_image_get_gicon (image);
return gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
}
else if (storage_type == GTK_IMAGE_SURFACE)

7
tests/testdnd2.c
View File

@ -4,8 +4,6 @@ static cairo_surface_t *
get_image_surface (GtkImage *image,
int *out_size)
{
const gchar *icon_name;
GtkIconSize size;
GtkIconTheme *icon_theme;
int width;
cairo_surface_t *surface;
@ -17,7 +15,8 @@ get_image_surface (GtkImage *image,
*out_size = cairo_image_surface_get_width (surface);
return cairo_surface_reference (surface);
case GTK_IMAGE_ICON_NAME:
gtk_image_get_icon_name (image, &icon_name, &size);
<<<<<<< HEAD
icon_name = gtk_image_get_icon_name (image);
icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
gtk_icon_size_lookup (size, &width, NULL);
*out_size = width;
@ -175,7 +174,7 @@ image_drag_data_get (GtkWidget *widget,
break;
case TARGET_TEXT:
if (gtk_image_get_storage_type (GTK_IMAGE (data)) == GTK_IMAGE_ICON_NAME)
gtk_image_get_icon_name (GTK_IMAGE (data), &name, NULL);
name = gtk_image_get_icon_name (GTK_IMAGE (data));
else
name = "Boo!";
gtk_selection_data_set_text (selection_data, name, -1);