Commit 7a76d245 authored by Christian Neumair's avatar Christian Neumair Committed by Christian Neumair

Display emblems for small icon sizes, down to 16 pixels.

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.

svn path=/trunk/; revision=14361
parent 82d2b78b
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.
2008-07-14 A. Walton <awalton@gnome.org>
* libnautilus-private/nautilus-emblem-utils.c
......
......@@ -681,8 +681,10 @@ nautilus_icon_get_emblem_size_for_icon_size (guint size)
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 */
}
......@@ -336,11 +336,6 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment