diff options
author | Carlos Soriano <csoriano@gnome.org> | 2016-03-07 12:27:12 +0100 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2016-03-07 12:27:12 +0100 |
commit | 05d89691b3edd2c0191c6657e13b39503d5f503b (patch) | |
tree | 03e68609cb2b899285f4eaf837f161c19e0854c2 | |
parent | afdc6f9ac8f67de6ac1a34cbb78e8c4acf242dd7 (diff) | |
download | nautilus-05d89691b3edd2c0191c6657e13b39503d5f503b.tar.gz |
Revert "Don't show thumbnails for small zoom levels"
This reverts commit 6ed964542df4208050b22aac1b7ca2c0901ab4ef.
-rw-r--r-- | libnautilus-private/nautilus-file.c | 21 | ||||
-rw-r--r-- | libnautilus-private/nautilus-file.h | 3 |
2 files changed, 1 insertions, 23 deletions
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 8bdfcfd96..22e29ddd8 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -4581,24 +4581,6 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file, return icon; } -gboolean nautilus_thumbnail_is_limited_by_zoom (int size, int scale, - NautilusFileIconFlags flags) -{ - int zoom_level; - - if (flags & NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE) { - zoom_level = size * scale; - } else { - zoom_level = size * scale * - cached_thumbnail_size / NAUTILUS_CANVAS_ICON_SIZE_SMALL; - } - - if (zoom_level <= NAUTILUS_LIST_ICON_SIZE_SMALL) - return FALSE; - - return TRUE; -} - NautilusIconInfo * nautilus_file_get_icon (NautilusFile *file, int size, @@ -4626,8 +4608,7 @@ nautilus_file_get_icon (NautilusFile *file, flags & NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE); if (flags & NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS && - nautilus_file_should_show_thumbnail (file) && - nautilus_thumbnail_is_limited_by_zoom (size, scale, flags)) { + nautilus_file_should_show_thumbnail (file)) { icon = nautilus_file_get_thumbnail_icon (file, size, scale, flags); } diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h index a6a657ed2..363fbff38 100644 --- a/libnautilus-private/nautilus-file.h +++ b/libnautilus-private/nautilus-file.h @@ -210,9 +210,6 @@ NautilusRequestStatus nautilus_file_get_deep_counts (Nautilu gboolean force); gboolean nautilus_file_should_show_thumbnail (NautilusFile *file); gboolean nautilus_file_should_show_directory_item_count (NautilusFile *file); -gboolean nautilus_thumbnail_is_limited_by_zoom (int size, - int scale, - NautilusFileIconFlags flags); void nautilus_file_set_search_relevance (NautilusFile *file, gdouble relevance); |