diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-07-15 06:49:34 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-07-15 06:49:34 +0000 |
| commit | 7a76d2458611d1ae83feac7b1bb76d86b12a57da (patch) | |
| tree | fd6926e1795c731c1697d66b57f361a17bcde9ee | |
| parent | 82d2b78b236123fee80ae9c0b5170924355e12c7 (diff) | |
| download | nautilus-7a76d2458611d1ae83feac7b1bb76d86b12a57da.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-info.c | 4 | ||||
| -rw-r--r-- | src/file-manager/fm-list-model.c | 5 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,10 @@ +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 diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c index c85e8af7d..6907fc32c 100644 --- a/libnautilus-private/nautilus-icon-info.c +++ b/libnautilus-private/nautilus-icon-info.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 */ } diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c index a5f1b09e4..22378c583 100644 --- a/src/file-manager/fm-list-model.c +++ b/src/file-manager/fm-list-model.c @@ -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, |