Commit cb99884c authored by John Sullivan's avatar John Sullivan

Changed decision of when to draw mini-text on an icon to

        be based on icon size rather than zoom level, so it works
        more sensibly with stretched icons.
parent a589b69a
2000-03-09 John Sullivan <sullivan@eazel.com>
* libnautilus/gnome-icon-container.c: (update_icon):
Changed decision of when to draw mini-text on an icon to
be based on icon size rather than zoom level, so it works
more sensibly with stretched icons.
2000-03-09 John Sullivan <sullivan@eazel.com>
Bug fixes and memory leak fixes.
......@@ -29,7 +36,7 @@
NautilusThumbnailInfos.
(nautilus_icon_factory_get_thumbnail_uri): Use compare_thumbnail_info
to avoid putting the same uri in the thumbnail-making queue multiple
times. This may or may not have been the cause of an intermittend
times. This may or may not have been the cause of an intermittent
thumbnail-creating problem I was seeing.
2000-03-08 Andy Hertzfeld <andy@eazel.com>
......
......@@ -2571,7 +2571,10 @@ update_icon (GnomeIconContainer *container, GnomeIconContainerIcon *icon)
font = details->label_font[details->zoom_level];
if (details->zoom_level < NAUTILUS_ZOOM_LEVEL_STANDARD) {
/* Choose to show mini-text based on this icon's size, not zoom level,
* since icon may be stretched big or small.
*/
if (icon_size_x < NAUTILUS_ICON_SIZE_STANDARD || icon_size_y < NAUTILUS_ICON_SIZE_STANDARD) {
contents_as_text = NULL;
} else {
contents_as_text = nautilus_icons_controller_get_icon_property
......
......@@ -2571,7 +2571,10 @@ update_icon (GnomeIconContainer *container, GnomeIconContainerIcon *icon)
font = details->label_font[details->zoom_level];
if (details->zoom_level < NAUTILUS_ZOOM_LEVEL_STANDARD) {
/* Choose to show mini-text based on this icon's size, not zoom level,
* since icon may be stretched big or small.
*/
if (icon_size_x < NAUTILUS_ICON_SIZE_STANDARD || icon_size_y < NAUTILUS_ICON_SIZE_STANDARD) {
contents_as_text = NULL;
} else {
contents_as_text = nautilus_icons_controller_get_icon_property
......
......@@ -2571,7 +2571,10 @@ update_icon (GnomeIconContainer *container, GnomeIconContainerIcon *icon)
font = details->label_font[details->zoom_level];
if (details->zoom_level < NAUTILUS_ZOOM_LEVEL_STANDARD) {
/* Choose to show mini-text based on this icon's size, not zoom level,
* since icon may be stretched big or small.
*/
if (icon_size_x < NAUTILUS_ICON_SIZE_STANDARD || icon_size_y < NAUTILUS_ICON_SIZE_STANDARD) {
contents_as_text = NULL;
} else {
contents_as_text = nautilus_icons_controller_get_icon_property
......
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