X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=cut-n-paste%2Frecent-files%2Fegg-recent-util.c;h=6780cd1ee02dcfd1deeacd16baa4720fd2f7c714;hb=1a1099e24c625b8ab7816f1ec1ff85cb8e2880d4;hp=cb30e053fb1554450576cea155b38afbb9635f9e;hpb=69d92c409d333e5dd9cc82537c0834b201487c60;p=evince.git

diff --git a/cut-n-paste/recent-files/egg-recent-util.c b/cut-n-paste/recent-files/egg-recent-util.c
index cb30e053..6780cd1e 100644
--- a/cut-n-paste/recent-files/egg-recent-util.c
+++ b/cut-n-paste/recent-files/egg-recent-util.c
@@ -54,51 +54,32 @@ egg_recent_util_escape_underlines (const gchar* text)
 }
 
 #ifndef USE_STABLE_LIBGNOMEUI
-static GdkPixbuf *
-scale_icon (GdkPixbuf *pixbuf,
-	    double *scale)
-{
-	guint width, height;
-
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-
-	width = floor (width * *scale + 0.5);
-	height = floor (height * *scale + 0.5);
-	
-	return gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
-}
-
 static GdkPixbuf *
 load_icon_file (char          *filename,
-		guint          base_size,
 		guint          nominal_size)
 {
 	GdkPixbuf *pixbuf, *scaled_pixbuf;
-	guint width, height, size;
-	double scale;
+	guint width, height;
 
-	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+	pixbuf = gdk_pixbuf_new_from_file_at_size (filename, nominal_size, nominal_size, NULL);
 
 	if (pixbuf == NULL) {
 		return NULL;
 	}
 	
-	if (base_size == 0) {
-		width = gdk_pixbuf_get_width (pixbuf); 
-		height = gdk_pixbuf_get_height (pixbuf);
-		size = MAX (width, height);
-		if (size > nominal_size) {
-			base_size = size;
+	width = gdk_pixbuf_get_width (pixbuf); 
+	height = gdk_pixbuf_get_height (pixbuf);
+	/* if the icon is larger than the nominal size, scale down */
+	if (MAX (width, height) > nominal_size) {
+		if (width > height) {
+			height = height * nominal_size / width;
+			width = nominal_size;
 		} else {
-			/* Don't scale up small icons */
-			base_size = nominal_size;
+			width = width * nominal_size / height;
+			height = nominal_size;
 		}
-	}
-	
-	if (base_size != nominal_size) {
-		scale = (double)nominal_size/base_size;
-		scaled_pixbuf = scale_icon (pixbuf, &scale);
+		scaled_pixbuf = gdk_pixbuf_scale_simple
+			(pixbuf, width, height, GDK_INTERP_BILINEAR);
 		g_object_unref (pixbuf);
 		pixbuf = scaled_pixbuf;
 	}
@@ -113,7 +94,6 @@ egg_recent_util_get_icon (GnomeIconTheme *theme, const gchar *uri,
 	gchar *icon;
 	gchar *filename;
 	const GnomeIconData *icon_data;
-	int base_size;
 	GdkPixbuf *pixbuf;
 	
 	icon = gnome_icon_lookup (theme, NULL, uri, NULL, NULL,
@@ -125,14 +105,14 @@ egg_recent_util_get_icon (GnomeIconTheme *theme, const gchar *uri,
 	filename = gnome_icon_theme_lookup_icon (theme, icon,
 						 size,
 						 &icon_data,
-						 &base_size);
+						 NULL);
 	g_free (icon);
 
 	if (filename == NULL) {
 		return NULL;
 	}
 
-	pixbuf = load_icon_file (filename, base_size, size);
+	pixbuf = load_icon_file (filename, size);
 	g_free (filename);