nautilus r14361 - in trunk: . libnautilus-private src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Tue Jul 15 06:49:34 2008
New Revision: 14361
URL: http://svn.gnome.org/viewvc/nautilus?rev=14361&view=rev

Log:
2008-07-15  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-icon-info.c
	(nautilus_icon_get_emblem_size_for_icon_size):
	* src/file-manager/fm-list-model.c (fm_list_model_get_value):
	Display emblems for small icon sizes, down to 16 pixels.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-info.c
   trunk/src/file-manager/fm-list-model.c

Modified: trunk/libnautilus-private/nautilus-icon-info.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-info.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-info.c	Tue Jul 15 06:49:34 2008
@@ -681,8 +681,10 @@
 		return 32;
 	if (size >= 48)
 		return 24;
-	if (size >= 32)
+	if (size >= 24)
 		return 16;
+	if (size >= 16)
+		return 12;
 	
 	return 0; /* no emblems for smaller sizes */
 }

Modified: trunk/src/file-manager/fm-list-model.c
==============================================================================
--- trunk/src/file-manager/fm-list-model.c	(original)
+++ trunk/src/file-manager/fm-list-model.c	Tue Jul 15 06:49:34 2008
@@ -336,11 +336,6 @@
 			zoom_level = fm_list_model_get_zoom_level_from_emblem_column_id (column);
 			icon_size = nautilus_get_icon_size_for_zoom_level (zoom_level);
 			emblem_size = nautilus_icon_get_emblem_size_for_icon_size (icon_size);
-			/* Special case default icon size here. This works semi-ok, since we
-			   only show one emblem for the list view anyway */
-			if (emblem_size == 0 && icon_size >= 24) {
-				emblem_size = 16;
-			}
 			if (emblem_size != 0) {
 				emblem_pixbufs = nautilus_file_get_emblem_pixbufs (file,
 										   emblem_size,