From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sat, 9 Jun 2007 09:51:30 +0000 (+0000)
Subject: Remove a mutex in the main thread that blocks the UI in heavy documents.
X-Git-Tag: EVINCE_0_9_1~15
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=2e4b5a98297698180c1be5adffe809210bdcadb2;p=evince.git

Remove a mutex in the main thread that blocks the UI in heavy documents.

2007-06-09  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-sidebar-thumbnails.c:
	(ev_sidebar_thumbnails_set_loading_icon):
	Remove a mutex in the main thread that blocks the UI in heavy
	documents.

svn path=/trunk/; revision=2492
---

diff --git a/ChangeLog b/ChangeLog
index 8cfa38fa..4fbea898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-09  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* shell/ev-sidebar-thumbnails.c:
+	(ev_sidebar_thumbnails_set_loading_icon):
+
+	Remove a mutex in the main thread that blocks the UI in heavy
+	documents.
+	
 2007-06-09  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* shell/ev-pixbuf-cache.c (copy_job_to_job_info):
diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index d6a8af51..26760a96 100644
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -393,26 +393,21 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails)
 static void
 ev_sidebar_thumbnails_set_loading_icon (EvSidebarThumbnails *sidebar_thumbnails)
 {
-	gint width = THUMBNAIL_WIDTH;
-	gint height = THUMBNAIL_WIDTH;
-
 	if (sidebar_thumbnails->priv->loading_icon)
 		g_object_unref (sidebar_thumbnails->priv->loading_icon);
 
 	if (sidebar_thumbnails->priv->document) {
-		EvRenderContext *rc;
-
-		rc = ev_render_context_new (sidebar_thumbnails->priv->rotation, 0,
-					    get_scale_for_page (sidebar_thumbnails, 0));
+		gint width = THUMBNAIL_WIDTH;
+		gint height;
+		gint page_width, page_height;
 
-		/* We get the dimensions of the first doc so that we can make a blank
+		/* We get the dimensions of the first page so that we can make a blank
 		 * icon.  */
-		ev_document_doc_mutex_lock ();
-		ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (sidebar_thumbnails->priv->document),
-						       rc, &width, &height);
-		ev_document_doc_mutex_unlock ();
-		
-		g_object_unref (rc);
+		ev_page_cache_get_size (sidebar_thumbnails->priv->page_cache, 0,
+					sidebar_thumbnails->priv->rotation,
+					1.0, &page_width, &page_height);
+
+		height = (gint) (page_height * ((gdouble)width / page_width));
 		
 		sidebar_thumbnails->priv->loading_icon =
 			ev_document_misc_get_thumbnail_frame (width, height, NULL);