Use an EvRenderContext for rendering thumbnails instead of a suggested

2007-02-16  Carlos Garcia Campos  <carlosgc@gnome.org>
	* backend/dvi/dvi-document.c:
	(dvi_document_thumbnails_get_dimensions),
	(dvi_document_thumbnails_get_thumbnail):
	* backend/impress/impress-document.c:
	(impress_document_thumbnails_get_thumbnail),
	(impress_document_thumbnails_get_dimensions):
	* backend/ps/ps-document.c: (ps_document_thumbnails_get_thumbnail),
	(ps_document_thumbnails_get_dimensions):
	* backend/djvu/djvu-document.c:
	(djvu_document_thumbnails_get_dimensions),
	(djvu_document_thumbnails_get_thumbnail):
	* backend/tiff/tiff-document.c:
	(tiff_document_thumbnails_get_thumbnail),
	(tiff_document_thumbnails_get_dimensions):
	* backend/pdf/ev-poppler.cc: (make_thumbnail_for_page),
	(pdf_document_thumbnails_get_thumbnail),
	(pdf_document_thumbnails_get_dimensions):
	* backend/comics/comics-document.c:
	(comics_document_thumbnails_get_thumbnail),
	(comics_document_thumbnails_get_dimensions):
	* backend/pixbuf/pixbuf-document.c:
	(pixbuf_document_thumbnails_get_thumbnail),
	(pixbuf_document_thumbnails_get_dimensions):
	* libdocument/ev-document-thumbnails.[ch]:
	(ev_document_thumbnails_get_thumbnail),
	(ev_document_thumbnails_get_dimensions):
	* libdocument/ev-document-misc.[ch]:
	(ev_document_misc_get_thumbnail_frame):
	* shell/ev-jobs.[ch]: (ev_job_thumbnail_dispose),
	(ev_job_thumbnail_new), (ev_job_thumbnail_run):
	* shell/ev-sidebar-thumbnails.c: (get_scale_for_page), (add_range),
	(ev_sidebar_thumbnails_set_loading_icon), (refresh),
	(ev_sidebar_thumbnails_refresh):
	* shell/ev-window.c: (ev_window_setup_document):
	* thumbnailer/evince-thumbnailer.c: (evince_thumbnail_pngenc_get):
	Use an EvRenderContext for rendering thumbnails instead of a suggested
	width, so that different sized pages get sized proportionally.

svn path=/trunk/; revision=2332

1 files changed, 21 insertions, 46 deletions

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index 7f53f85..e0fdd31 100644
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -409,52 +409,19 @@ get_supported_image_extensions()
 	return extensions;
 }
 
-static void 
-comics_document_thumbnails_get_geometry (EvDocumentThumbnails *document,
-					 gint                  page,
-					 gint                  suggested_width,
-					 gint                 *width,
-					 gint                 *height,
-					 gdouble              *scale_factor)
-{
-	gdouble orig_width, orig_height, scale;
-
-	comics_document_get_page_size (EV_DOCUMENT (document), page,
-				       &orig_width, &orig_height);
-	scale = suggested_width / orig_width;
-
-	if (width)
-		*width = suggested_width;
-	if (height)
-		*height = orig_height * scale;
-	if (scale_factor)
-		*scale_factor = scale;
-}
-
 static GdkPixbuf *
 comics_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
-					gint 		      page,
-					gint	              rotation,
-					gint                  size,
-					gboolean              border)
+					  EvRenderContext      *rc,
+					  gboolean              border)
 {
-	GdkPixbuf *thumbnail, *framed;
-	gint thumb_width, thumb_height;
-	gdouble scale;
-        EvRenderContext *rc;
+	GdkPixbuf *thumbnail;
 
-	comics_document_thumbnails_get_geometry (document, page, size,
-						 &thumb_width, &thumb_height,
-						 &scale);
-
-	rc = ev_render_context_new (rotation, page, scale);
-	thumbnail = comics_document_render_pixbuf (EV_DOCUMENT (document),
-						   rc);
-	g_object_unref (G_OBJECT (rc));
+	thumbnail = comics_document_render_pixbuf (EV_DOCUMENT (document), rc);
 
 	if (border) {
 	      GdkPixbuf *tmp_pixbuf = thumbnail;
-	      thumbnail = ev_document_misc_get_thumbnail_frame (-1, -1, 0, tmp_pixbuf);
+	      
+	      thumbnail = ev_document_misc_get_thumbnail_frame (-1, -1, tmp_pixbuf);
 	      g_object_unref (tmp_pixbuf);
 	}
 
@@ -463,14 +430,22 @@ comics_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 
 static void
 comics_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
-					   gint                  page,
-					   gint                  suggested_width,
-					   gint                  *width,
-					   gint                  *height)
+					   EvRenderContext      *rc,
+					   gint                 *width,
+					   gint                 *height)
 {
-	comics_document_thumbnails_get_geometry (document, page,
-						 suggested_width,
-						 width, height, NULL);
+	gdouble page_width, page_height;
+	
+	comics_document_get_page_size (EV_DOCUMENT (document), rc->page,
+				       &page_width, &page_height);
+
+	if (rc->rotation == 90 || rc->rotation == 270) {
+		*width = (gint) (page_height * rc->scale);
+		*height = (gint) (page_width * rc->scale);
+	} else {
+		*width = (gint) (page_width * rc->scale);
+		*height = (gint) (page_height * rc->scale);
+	}
 }
 
 static void