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

GtkEntry: Use surfaces, not pixbufs for bitmapped icons

Browse Source
This commit is contained in:
Alexander Larsson 2017-10-23 12:49:42 +02:00
parent 7a0ce9804f
commit 6f8644ad25
4 changed files with 82 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -914,11 +914,11 @@ gtk_entry_reset_im_context
gtk_entry_set_tabs
gtk_entry_get_tabs
GtkEntryIconPosition
gtk_entry_set_icon_from_pixbuf
gtk_entry_set_icon_from_surface
gtk_entry_set_icon_from_icon_name
gtk_entry_set_icon_from_gicon
gtk_entry_get_icon_storage_type
gtk_entry_get_icon_pixbuf
gtk_entry_get_icon_surface
gtk_entry_get_icon_name
gtk_entry_get_icon_gicon
gtk_entry_set_icon_activatable

130
gtk/gtkentry.c
View File

@ -30,6 +30,8 @@
#include <string.h>
#include <cairo-gobject.h>
#include "gtkbindings.h"
#include "gtkcelleditable.h"
#include "gtkclipboard.h"
@ -104,7 +106,7 @@
* icons can be activatable by clicking, can be set up as drag source and
* can have tooltips. To add an icon, use gtk_entry_set_icon_from_gicon() or
* one of the various other functions that set an icon from a stock id, an
* icon name or a pixbuf. To trigger an action when the user clicks an icon,
* icon name, or a surface. To trigger an action when the user clicks an icon,
* connect to the #GtkEntry::icon-press signal. To allow DND operations
* from an icon, use gtk_entry_set_icon_drag_source(). To set a tooltip on
* an icon, use gtk_entry_set_icon_tooltip_text() or the corresponding function
@ -337,8 +339,8 @@ enum {
PROP_CAPS_LOCK_WARNING,
PROP_PROGRESS_FRACTION,
PROP_PROGRESS_PULSE_STEP,
PROP_PIXBUF_PRIMARY,
PROP_PIXBUF_SECONDARY,
PROP_SURFACE_PRIMARY,
PROP_SURFACE_SECONDARY,
PROP_ICON_NAME_PRIMARY,
PROP_ICON_NAME_SECONDARY,
PROP_GICON_PRIMARY,
@ -1005,32 +1007,32 @@ gtk_entry_class_init (GtkEntryClass *class)
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
* GtkEntry:primary-icon-pixbuf:
* GtkEntry:primary-icon-surface:
*
* A pixbuf to use as the primary icon for the entry.
* A surface to use as the primary icon for the entry.
*
* Since: 2.16
*/
entry_props[PROP_PIXBUF_PRIMARY] =
g_param_spec_object ("primary-icon-pixbuf",
P_("Primary pixbuf"),
P_("Primary pixbuf for the entry"),
GDK_TYPE_PIXBUF,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
entry_props[PROP_SURFACE_PRIMARY] =
g_param_spec_boxed ("primary-icon-surface",
P_("Primary surface"),
P_("Primary surface for the entry"),
CAIRO_GOBJECT_TYPE_SURFACE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
* GtkEntry:secondary-icon-pixbuf:
* GtkEntry:secondary-icon-surface:
*
* An pixbuf to use as the secondary icon for the entry.
* An surface to use as the secondary icon for the entry.
*
* Since: 2.16
*/
entry_props[PROP_PIXBUF_SECONDARY] =
g_param_spec_object ("secondary-icon-pixbuf",
P_("Secondary pixbuf"),
P_("Secondary pixbuf for the entry"),
GDK_TYPE_PIXBUF,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
entry_props[PROP_SURFACE_SECONDARY] =
g_param_spec_boxed ("secondary-icon-surface",
P_("Secondary surface"),
P_("Secondary surface for the entry"),
CAIRO_GOBJECT_TYPE_SURFACE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
* GtkEntry:primary-icon-name:
@ -2027,16 +2029,16 @@ gtk_entry_set_property (GObject *object,
gtk_entry_set_placeholder_text (entry, g_value_get_string (value));
break;
case PROP_PIXBUF_PRIMARY:
gtk_entry_set_icon_from_pixbuf (entry,
GTK_ENTRY_ICON_PRIMARY,
g_value_get_object (value));
case PROP_SURFACE_PRIMARY:
gtk_entry_set_icon_from_surface (entry,
GTK_ENTRY_ICON_PRIMARY,
g_value_get_boxed (value));
break;
case PROP_PIXBUF_SECONDARY:
gtk_entry_set_icon_from_pixbuf (entry,
GTK_ENTRY_ICON_SECONDARY,
g_value_get_object (value));
case PROP_SURFACE_SECONDARY:
gtk_entry_set_icon_from_surface (entry,
GTK_ENTRY_ICON_SECONDARY,
g_value_get_boxed (value));
break;
case PROP_ICON_NAME_PRIMARY:
@ -2270,15 +2272,15 @@ gtk_entry_get_property (GObject *object,
g_value_set_string (value, gtk_entry_get_placeholder_text (entry));
break;
case PROP_PIXBUF_PRIMARY:
g_value_set_object (value,
gtk_entry_get_icon_pixbuf (entry,
case PROP_SURFACE_PRIMARY:
g_value_set_boxed (value,
gtk_entry_get_icon_surface (entry,
GTK_ENTRY_ICON_PRIMARY));
break;
case PROP_PIXBUF_SECONDARY:
g_value_set_object (value,
gtk_entry_get_icon_pixbuf (entry,
case PROP_SURFACE_SECONDARY:
g_value_set_boxed (value,
gtk_entry_get_icon_surface (entry,
GTK_ENTRY_ICON_SECONDARY));
break;
@ -2639,9 +2641,9 @@ gtk_entry_dispose (GObject *object)
GtkEntryPrivate *priv = entry->priv;
GdkKeymap *keymap;
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
gtk_entry_set_icon_from_surface (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
gtk_entry_set_icon_from_surface (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
gtk_entry_set_completion (entry, NULL);
@ -6618,11 +6620,11 @@ gtk_entry_clear_icon (GtkEntry *entry,
switch (storage_type)
{
case GTK_IMAGE_PIXBUF:
case GTK_IMAGE_SURFACE:
g_object_notify_by_pspec (G_OBJECT (entry),
entry_props[icon_pos == GTK_ENTRY_ICON_PRIMARY
? PROP_PIXBUF_PRIMARY
: PROP_PIXBUF_SECONDARY]);
? PROP_SURFACE_PRIMARY
: PROP_SURFACE_SECONDARY]);
break;
case GTK_IMAGE_ICON_NAME:
@ -6641,7 +6643,7 @@ gtk_entry_clear_icon (GtkEntry *entry,
case GTK_IMAGE_EMPTY:
case GTK_IMAGE_ANIMATION:
case GTK_IMAGE_SURFACE:
case GTK_IMAGE_PIXBUF:
default:
g_assert_not_reached ();
break;
@ -7508,21 +7510,21 @@ gtk_entry_get_alignment (GtkEntry *entry)
}
/**
* gtk_entry_set_icon_from_pixbuf:
* gtk_entry_set_icon_from_surface:
* @entry: a #GtkEntry
* @icon_pos: Icon position
* @pixbuf: (allow-none): A #GdkPixbuf, or %NULL
* @surface: (allow-none): An image #cairo_surface, or %NULL
*
* Sets the icon shown in the specified position using a pixbuf.
* Sets the icon shown in the specified position using a image surface.
*
* If @pixbuf is %NULL, no icon will be shown in the specified position.
* If @surface is %NULL, no icon will be shown in the specified position.
*
* Since: 2.16
* Since: 3.94
*/
void
gtk_entry_set_icon_from_pixbuf (GtkEntry *entry,
GtkEntryIconPosition icon_pos,
GdkPixbuf *pixbuf)
gtk_entry_set_icon_from_surface (GtkEntry *entry,
GtkEntryIconPosition icon_pos,
cairo_surface_t *surface)
{
GtkEntryPrivate *priv;
EntryIconInfo *icon_info;
@ -7537,25 +7539,25 @@ gtk_entry_set_icon_from_pixbuf (GtkEntry *entry,
g_object_freeze_notify (G_OBJECT (entry));
if (pixbuf)
g_object_ref (pixbuf);
if (surface)
cairo_surface_reference (surface);
if (pixbuf)
if (surface)
{
gtk_image_set_from_pixbuf (GTK_IMAGE (icon_info->widget), pixbuf);
gtk_image_set_from_surface (GTK_IMAGE (icon_info->widget), surface);
if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
{
g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_PIXBUF_PRIMARY]);
g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_SURFACE_PRIMARY]);
g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_STORAGE_TYPE_PRIMARY]);
}
else
{
g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_PIXBUF_SECONDARY]);
g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_SURFACE_SECONDARY]);
g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_STORAGE_TYPE_SECONDARY]);
}
g_object_unref (pixbuf);
cairo_surface_destroy (surface);
}
else
gtk_entry_clear_icon (entry, icon_pos);
@ -7752,7 +7754,7 @@ gtk_entry_get_icon_activatable (GtkEntry *entry,
}
/**
* gtk_entry_get_icon_pixbuf:
* gtk_entry_get_icon_surface:
* @entry: A #GtkEntry
* @icon_pos: Icon position
*
@ -7760,16 +7762,16 @@ gtk_entry_get_icon_activatable (GtkEntry *entry,
*
* Unlike the other methods of setting and getting icon data, this
* method will work regardless of whether the icon was set using a
* #GdkPixbuf, a #GIcon or an icon name.
* #cairo_surface_t, a #GIcon or an icon name.
*
* Returns: (transfer none) (nullable): A #GdkPixbuf, or %NULL if no icon is
* Returns: (transfer none) (nullable): A #cairo_surface_t, or %NULL if no icon is
* set for this position.
*
* Since: 2.16
* Since: 3.94
*/
GdkPixbuf *
gtk_entry_get_icon_pixbuf (GtkEntry *entry,
GtkEntryIconPosition icon_pos)
cairo_surface_t *
gtk_entry_get_icon_surface (GtkEntry *entry,
GtkEntryIconPosition icon_pos)
{
GtkEntryPrivate *priv;
EntryIconInfo *icon_info;
@ -7784,7 +7786,7 @@ gtk_entry_get_icon_pixbuf (GtkEntry *entry,
if (!icon_info)
return NULL;
return gtk_image_get_pixbuf (GTK_IMAGE (icon_info->widget));
return gtk_image_get_surface (GTK_IMAGE (icon_info->widget));
}
/**
@ -7794,7 +7796,7 @@ gtk_entry_get_icon_pixbuf (GtkEntry *entry,
*
* Retrieves the #GIcon used for the icon, or %NULL if there is
* no icon or if the icon was set by some other method (e.g., by
* stock, pixbuf, or icon name).
* stock, surface, or icon name).
*
* Returns: (transfer none) (nullable): A #GIcon, or %NULL if no icon is set
* or if the icon is not a #GIcon
@ -7831,7 +7833,7 @@ gtk_entry_get_icon_gicon (GtkEntry *entry,
*
* Retrieves the icon name used for the icon, or %NULL if there is
* no icon or if the icon was set by some other method (e.g., by
* pixbuf, stock or gicon).
* surface, stock or gicon).
*
* Returns: (nullable): An icon name, or %NULL if no icon is set or if the icon
* wasn’t set from an icon name

10
gtk/gtkentry.h
View File

@ -283,10 +283,10 @@ void gtk_entry_set_placeholder_text (GtkEntry *entry,
const gchar *text);
/* Setting and managing icons
*/
GDK_AVAILABLE_IN_ALL
void gtk_entry_set_icon_from_pixbuf (GtkEntry *entry,
GDK_AVAILABLE_IN_3_94
void gtk_entry_set_icon_from_surface (GtkEntry *entry,
GtkEntryIconPosition icon_pos,
GdkPixbuf *pixbuf);
cairo_surface_t *surface);
GDK_AVAILABLE_IN_ALL
void gtk_entry_set_icon_from_icon_name (GtkEntry *entry,
GtkEntryIconPosition icon_pos,
@ -298,8 +298,8 @@ void gtk_entry_set_icon_from_gicon (GtkEntry *
GDK_AVAILABLE_IN_ALL
GtkImageType gtk_entry_get_icon_storage_type (GtkEntry *entry,
GtkEntryIconPosition icon_pos);
GDK_AVAILABLE_IN_ALL
GdkPixbuf* gtk_entry_get_icon_pixbuf (GtkEntry *entry,
GDK_AVAILABLE_IN_3_94
cairo_surface_t*gtk_entry_get_icon_surface (GtkEntry *entry,
GtkEntryIconPosition icon_pos);
GDK_AVAILABLE_IN_ALL
const gchar* gtk_entry_get_icon_name (GtkEntry *entry,

14
tests/testentryicons.c
View File

@ -80,16 +80,20 @@ set_gicon (GtkWidget *button,
}
static void
set_pixbuf (GtkWidget *button,
GtkEntry *entry)
set_surface (GtkWidget *button,
GtkEntry *entry)
{
GdkPixbuf *pixbuf;
cairo_surface_t *surface;
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
pixbuf = gdk_pixbuf_new_from_resource ("/org/gtk/libgtk/inspector/logo.png", NULL);
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_SECONDARY, pixbuf);
surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, gtk_widget_get_window (button));
g_object_unref (pixbuf);
gtk_entry_set_icon_from_surface (entry, GTK_ENTRY_ICON_SECONDARY, surface);
cairo_surface_destroy (surface);
}
}
@ -269,10 +273,10 @@ main (int argc, char **argv)
gtk_radio_button_join_group (GTK_RADIO_BUTTON (button3), GTK_RADIO_BUTTON (button1));
g_signal_connect (button3, "toggled", G_CALLBACK (set_gicon), entry);
gtk_container_add (GTK_CONTAINER (box), button3);
button4 = gtk_radio_button_new_with_label (NULL, "Pixbuf");
button4 = gtk_radio_button_new_with_label (NULL, "Surface");
gtk_widget_set_valign (button4, GTK_ALIGN_START);
gtk_radio_button_join_group (GTK_RADIO_BUTTON (button4), GTK_RADIO_BUTTON (button1));
g_signal_connect (button4, "toggled", G_CALLBACK (set_pixbuf), entry);
g_signal_connect (button4, "toggled", G_CALLBACK (set_surface), entry);
gtk_container_add (GTK_CONTAINER (box), button4);
label = gtk_label_new ("Emoji:");