diff options
| author | Christian Neumair <chris@gnome-de.org> | 2005-10-17 17:43:58 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2005-10-17 17:43:58 +0000 |
| commit | 38a5fd96a672345fed755a15efa2cf344a16fd17 (patch) | |
| tree | a95aa6e96790239746f654844e8b0dc64a9a81ce /libnautilus-private/nautilus-icon-factory.h | |
| parent | 79c68880b193430f544821b0f1bc5a3561c4449e (diff) | |
| download | nautilus-38a5fd96a672345fed755a15efa2cf344a16fd17.tar.gz | |
Kill NAUTILUS_ICON_SIZE_FOR_MENUS, make icon factory support GTK+ stock
2005-10-17 Christian Neumair <chris@gnome-de.org>
* libnautilus-private/nautilus-bookmark.c:
* libnautilus-private/nautilus-bookmark.h:
* libnautilus-private/nautilus-icon-container.c:
* libnautilus-private/nautilus-icon-factory.c:
* libnautilus-private/nautilus-icon-factory.h:
* libnautilus-private/nautilus-ui-utilities.c:
* src/nautilus-bookmarks-window.c:
* src/nautilus-history-sidebar.c:
* src/nautilus-places-sidebar.c:
* src/nautilus-sidebar-title.c:
* src/nautilus-spatial-window.c:
* src/nautilus-window-menus.c:
* src/file-manager/fm-directory-view.c:
Kill NAUTILUS_ICON_SIZE_FOR_MENUS, make icon factory support GTK+
stock icon size, use this size in the sidebar, and in menus.
Fixes #167107 and others.
Diffstat (limited to 'libnautilus-private/nautilus-icon-factory.h')
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.h | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h index 662aa68a7..410c500db 100644 --- a/libnautilus-private/nautilus-icon-factory.h +++ b/libnautilus-private/nautilus-icon-factory.h @@ -77,12 +77,6 @@ typedef enum { /* Maximum size of an icon that the icon factory will ever produce */ #define NAUTILUS_ICON_MAXIMUM_SIZE 320 -/* Icon size to use for menus. NAUTILUS_ICON_SIZE_SMALLEST - * is a little too small and NAUTILUS_ICON_SIZE_SMALLER is - * a little too big. - */ -#define NAUTILUS_ICON_SIZE_FOR_MENUS 20 - /* here's a structure to hold the emblem attach points */ #define MAX_ATTACH_POINTS 12 @@ -133,25 +127,29 @@ GdkPixbuf *nautilus_icon_factory_get_pixbuf_for_icon (const char guint nominal_size, NautilusEmblemAttachPoints *attach_points, GdkRectangle *embedded_text_rect, + gboolean force_size, gboolean wants_default, char **display_name); -GdkPixbuf *nautilus_icon_factory_get_pixbuf_for_icon_force_size (const char *icon, - const char *modifier, - guint nominal_size, - NautilusEmblemAttachPoints *attach_points, - GdkRectangle *embedded_text_rect, - gboolean wants_default, - char **display_name); +GdkPixbuf *nautilus_icon_factory_get_pixbuf_for_icon_with_stock_size (const char *icon, + const char *modifier, + GtkIconSize stock_size, + NautilusEmblemAttachPoints *attach_points, + GdkRectangle *embedded_text_rect, + gboolean wants_default, + char **display_name); + /* Convenience functions for the common case where you want to choose * and render the icon into a pixbuf all at once. */ GdkPixbuf *nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file, const char *modifer, - guint size_in_pixels); -GdkPixbuf *nautilus_icon_factory_get_pixbuf_for_file_force_size (NautilusFile *file, - const char *modifier, - guint size_in_pixels); + guint size_in_pixels, + gboolean force_size); +GdkPixbuf *nautilus_icon_factory_get_pixbuf_for_file_with_stock_size (NautilusFile *file, + const char *modifier, + GtkIconSize stock_size); + /* Convenience routine for getting a pixbuf from an icon name */ @@ -160,6 +158,10 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name (const guint size_in_pixels, gboolean force_size, char **display_name); +GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name_with_stock_size (const char *icon_name, + const char *modifer, + GtkIconSize stock_size, + char **display_name); GtkIconTheme * nautilus_icon_factory_get_icon_theme (void); GnomeThumbnailFactory *nautilus_icon_factory_get_thumbnail_factory (void); |