[nautilus] Removed more scaling fonts by zoom factor

[William Jon McCann <mccann src gnome org>]

commit e4f0a0f2e1895e4b24e241945e0fc3f7dd45e14e
Author: William Jon McCann <jmccann redhat com>
Date:   Sat Jul 21 11:52:43 2012 -0400

    Removed more scaling fonts by zoom factor

 libnautilus-private/nautilus-icon-canvas-item.c |    3 --
 libnautilus-private/nautilus-icon-container.c   |   35 -----------------------
 libnautilus-private/nautilus-icon-container.h   |    2 -
 libnautilus-private/nautilus-icon-private.h     |    3 --
 4 files changed, 0 insertions(+), 43 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index ecef5d4..01c6e06 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -1465,9 +1465,6 @@ create_label_layout (NautilusIconCanvasItem *item,
 		desc = pango_font_description_from_string (container->details->font);
 	} else {
 		desc = pango_font_description_copy (pango_context_get_font_description (context));
-		pango_font_description_set_size (desc,
-						 pango_font_description_get_size (desc) +
-						 container->details->font_size_table [container->details->zoom_level]);
 	}
 	pango_layout_set_font_description (layout, desc);
 	pango_font_description_free (desc);
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 14005e2..606c130 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -5419,14 +5419,6 @@ nautilus_icon_container_init (NautilusIconContainer *container)
 	details->layout_timestamp = UNDEFINED_TIME;
 	details->zoom_level = NAUTILUS_ZOOM_LEVEL_STANDARD;
 
-	details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLEST] = -2 * PANGO_SCALE;
-	details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLER] = -2 * PANGO_SCALE;
-	details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALL] = -0 * PANGO_SCALE;
-	details->font_size_table[NAUTILUS_ZOOM_LEVEL_STANDARD] = 0 * PANGO_SCALE;
-	details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGE] = 0 * PANGO_SCALE;
-	details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGER] = 0 * PANGO_SCALE;
-	details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST] = 0 * PANGO_SCALE;
-
 	container->details = details;
 
 	g_signal_connect (container, "focus-in-event",
@@ -7492,9 +7484,6 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
 	} else {
 		context = gtk_widget_get_pango_context (GTK_WIDGET (container));
 		desc = pango_font_description_copy (pango_context_get_font_description (context));
-		pango_font_description_set_size (desc,
-						 pango_font_description_get_size (desc) +
-						 container->details->font_size_table [container->details->zoom_level]);
 	}
 	eel_editable_label_set_font_description (EEL_EDITABLE_LABEL (details->rename_widget),
 						 desc);
@@ -7712,30 +7701,6 @@ nautilus_icon_container_set_font (NautilusIconContainer *container,
 	gtk_widget_queue_draw (GTK_WIDGET (container));
 }
 
-void
-nautilus_icon_container_set_font_size_table (NautilusIconContainer *container,
-					     const int font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST + 1])
-{
-	int old_font_size;
-	int i;
-	
-	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
-	g_return_if_fail (font_size_table != NULL);
-	
-	old_font_size = container->details->font_size_table[container->details->zoom_level];
-
-	for (i = 0; i <= NAUTILUS_ZOOM_LEVEL_LARGEST; i++) {
-		if (container->details->font_size_table[i] != font_size_table[i]) {
-			container->details->font_size_table[i] = font_size_table[i];
-		}
-	}
-
-	if (old_font_size != container->details->font_size_table[container->details->zoom_level]) {
-		invalidate_labels (container);
-		nautilus_icon_container_request_update_all (container);
-	}
-}
-
 /**
  * nautilus_icon_container_get_icon_description
  * @container: An icon container widget.
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index 7841ac4..6ae2eae 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -321,8 +321,6 @@ void              nautilus_icon_container_set_is_desktop                (Nautilu
 void              nautilus_icon_container_reset_scroll_region           (NautilusIconContainer  *container);
 void              nautilus_icon_container_set_font                      (NautilusIconContainer  *container,
 									 const char             *font); 
-void              nautilus_icon_container_set_font_size_table           (NautilusIconContainer  *container,
-									 const int               font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST + 1]);
 void              nautilus_icon_container_set_margins                   (NautilusIconContainer  *container,
 									 int                     left_margin,
 									 int                     right_margin,
diff --git a/libnautilus-private/nautilus-icon-private.h b/libnautilus-private/nautilus-icon-private.h
index 7babb6c..e689703 100644
--- a/libnautilus-private/nautilus-icon-private.h
+++ b/libnautilus-private/nautilus-icon-private.h
@@ -200,9 +200,6 @@ struct NautilusIconContainerDetails {
 	/* specific fonts used to draw labels */
 	char *font;
 	
-	/* font sizes used to draw labels */
-	int font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST + 1];
-
 	/* State used so arrow keys don't wander if icons aren't lined up.
 	 */
 	int arrow_key_start_x;