diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-11-14 19:43:13 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-11-15 14:22:17 -0500 |
| commit | dbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b (patch) | |
| tree | a76a5be1cac5ef746c431a00e8b79a93b63f3e10 /gtk/gtkshortcutsshortcut.c | |
| parent | 049cc6aa013601c4e662c38df408f8956b155f0a (diff) | |
| download | gtk+-dbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b.tar.gz | |
image: Remove icon-size argument from icon setters
Instead, add a function gtk_image_set_icon_size() for the cases where
overriding the icon size is necessary.
Treat icon sizes the same way as pixel sizes, too. So gtk_image_clear()
no longer unsets the icon size.
Diffstat (limited to 'gtk/gtkshortcutsshortcut.c')
| -rw-r--r-- | gtk/gtkshortcutsshortcut.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c index 2dcb96b5aa..7ad524117f 100644 --- a/gtk/gtkshortcutsshortcut.c +++ b/gtk/gtkshortcutsshortcut.c @@ -249,7 +249,7 @@ update_icon_from_type (GtkShortcutsShortcut *self) if (icon) { - gtk_image_set_from_gicon (self->image, icon, GTK_ICON_SIZE_DIALOG); + gtk_image_set_from_gicon (self->image, icon); gtk_image_set_pixel_size (self->image, 64); g_object_unref (icon); } @@ -271,7 +271,7 @@ static void gtk_shortcuts_shortcut_set_icon (GtkShortcutsShortcut *self, GIcon *gicon) { - gtk_image_set_from_gicon (self->image, gicon, GTK_ICON_SIZE_DIALOG); + gtk_image_set_from_gicon (self->image, gicon); gtk_shortcuts_shortcut_set_icon_set (self, gicon != NULL); g_object_notify (G_OBJECT (self), "icon"); } |