diff options
| author | Alexander Larsson <alexl@redhat.com> | 2004-12-15 11:20:41 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2004-12-15 11:20:41 +0000 |
| commit | d48b6fc82484d51c48dd42ad8fe38fe7f1892c28 (patch) | |
| tree | 5d154c6f81fce5db702a11f5782b078805add333 /libnautilus-private/nautilus-icon-container.c | |
| parent | 1c95a8010f8168f302668753ccd0ce3c6ceebda2 (diff) | |
| download | nautilus-d48b6fc82484d51c48dd42ad8fe38fe7f1892c28.tar.gz | |
Better handling of icon sizes, including framing of large file-as-icon
2004-12-15 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
* libnautilus-private/nautilus-icon-factory.c: (load_icon_file):
* libnautilus-private/nautilus-thumbnails.c:
(nautilus_thumbnail_frame_image),
(nautilus_thumbnail_load_framed_image):
* libnautilus-private/nautilus-thumbnails.h:
Better handling of icon sizes, including
framing of large file-as-icon images.
Patches from Jaap Haitsma <jaap@haitsma.org>
Diffstat (limited to 'libnautilus-private/nautilus-icon-container.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index a4883e834..ae86b80b3 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -4935,11 +4935,9 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container, NautilusIconContainerDetails *details; guint icon_size; guint min_image_size, max_image_size; - guint width, height, scaled_width, scaled_height; - double scale_factor; char *icon_name; NautilusEmblemAttachPoints attach_points; - GdkPixbuf *pixbuf, *emblem_pixbuf, *saved_pixbuf; + GdkPixbuf *pixbuf, *emblem_pixbuf; GList *emblem_icon_names, *emblem_pixbufs, *p; char *editable_text, *additional_text; char *embedded_text; @@ -4998,22 +4996,6 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container, nautilus_icon_container_start_monitor_top_left (container, icon->data, icon); } - /* in the rare case an image is too small, scale it up */ - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf); - if (width < min_image_size && height < min_image_size) { - scale_factor = MAX (min_image_size / (double) width, min_image_size / (double) height); - /* don't let it exceed the maximum width in the other dimension */ - scale_factor = MIN (scale_factor, max_image_size / width); - scale_factor = MIN (scale_factor, max_image_size / height); - - scaled_width = floor (width * scale_factor + .5); - scaled_height = floor (height * scale_factor + .5); - saved_pixbuf = pixbuf; - pixbuf = gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR); - g_object_unref (saved_pixbuf); - } - emblem_pixbufs = NULL; icon_size = MAX (nautilus_get_icon_size_for_zoom_level (container->details->zoom_level) |