diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-07-07 17:39:58 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-07-07 17:39:58 +0000 |
| commit | dc8f0ba5d22fc242664d5f5b97f422d83added4c (patch) | |
| tree | 57bdb6b6afafa05852b06193bfadf5f85c1aabb7 | |
| parent | 9f5de079fd1012aa604e37865d935c0d94a93ee6 (diff) | |
| download | nautilus-dc8f0ba5d22fc242664d5f5b97f422d83added4c.tar.gz | |
Use GTK_ICON_SIZE_LARGE_TOOLBAR instead of hard coding the icon size to
2008-07-07 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-ui-utilities.c
(nautilus_toolbar_action_from_menu_item):
Use GTK_ICON_SIZE_LARGE_TOOLBAR instead of hard coding the icon size
to 48. Fixes #541527. Thanks to Gilles Dartiguelongue.
svn path=/trunk/; revision=14324
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-ui-utilities.c | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2008-07-07 Christian Neumair <cneumair@gnome.org> + + * libnautilus-private/nautilus-ui-utilities.c + (nautilus_toolbar_action_from_menu_item): + Use GTK_ICON_SIZE_LARGE_TOOLBAR instead of hard coding the icon size + to 48. Fixes #541527. Thanks to Gilles Dartiguelongue. + 2008-07-06 Christian Neumair <cneumair@gnome.org> * src/nautilus-navigation-window.c (unset_focus_widget), diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c index 4aa7560f6..5b7bccb8b 100644 --- a/libnautilus-private/nautilus-ui-utilities.c +++ b/libnautilus-private/nautilus-ui-utilities.c @@ -187,6 +187,7 @@ nautilus_toolbar_action_from_menu_item (NautilusMenuItem *item) GtkAction *action; GdkPixbuf *pixbuf; NautilusIconInfo *info; + int icon_size; g_object_get (G_OBJECT (item), "name", &name, "label", &label, @@ -201,9 +202,10 @@ nautilus_toolbar_action_from_menu_item (NautilusMenuItem *item) icon_name); if (icon_name != NULL) { - info = nautilus_icon_info_lookup_from_name (icon_name, 24); + icon_size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_LARGE_TOOLBAR); + info = nautilus_icon_info_lookup_from_name (icon_name, icon_size); - pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, 24); + pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, icon_size); if (pixbuf != NULL) { g_object_set_data_full (G_OBJECT (action), "toolbar-icon", pixbuf, |