X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-sidebar-thumbnails.c;h=0d4ed3113fd7e3145da90cd5f44fd4b67970330a;hb=3d85ea1b45e9d6d2141df6cb797f8ad8325b4769;hp=192aa6f3d70e5af1cb9cd087742b18ee28f45c08;hpb=4936778a72f9e17d3bc53d52754a6d1a8ad345df;p=evince.git

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 192aa6f3..0d4ed311 100644
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -228,7 +228,7 @@ get_scale_for_page (EvSidebarThumbnails *sidebar_thumbnails,
 	gint width, height;
 
 	ev_page_cache_get_size (priv->page_cache,
-				page, priv->rotation,
+				page, 0,
 				1.0, &width, &height);
 	
 	return (gdouble)THUMBNAIL_WIDTH / (gdouble)width;
@@ -304,10 +304,10 @@ update_visible_range (EvSidebarThumbnails *sidebar_thumbnails,
 		return;
 
 	/* Clear the areas we no longer display */
-	if (old_start_page < start_page)
+	if (old_start_page >= 0 && old_start_page < start_page)
 		clear_range (sidebar_thumbnails, old_start_page, MIN (start_page - 1, old_end_page));
-
-	if (old_end_page > end_page)
+	
+	if (old_end_page > 0 && old_end_page > end_page)
 		clear_range (sidebar_thumbnails, MAX (end_page + 1, old_start_page), old_end_page);
 
 	add_range (sidebar_thumbnails, start_page, end_page);
@@ -407,18 +407,14 @@ ev_sidebar_thumbnails_set_loading_icon (EvSidebarThumbnails *sidebar_thumbnails)
 		g_object_unref (sidebar_thumbnails->priv->loading_icon);
 
 	if (sidebar_thumbnails->priv->document) {
-		gint width = THUMBNAIL_WIDTH;
-		gint height;
-		gint page_width, page_height;
+		gint width, height;
 
 		/* We get the dimensions of the first page so that we can make a blank
 		 * icon.  */
-		ev_page_cache_get_size (sidebar_thumbnails->priv->page_cache, 0,
-					sidebar_thumbnails->priv->rotation,
-					1.0, &page_width, &page_height);
+		ev_page_cache_get_thumbnail_size (sidebar_thumbnails->priv->page_cache, 0,
+						  sidebar_thumbnails->priv->rotation,
+						  &width, &height);
 
-		height = (gint) (page_height * ((gdouble)width / page_width));
-		
 		sidebar_thumbnails->priv->loading_icon =
 			ev_document_misc_get_thumbnail_frame (width, height, NULL);
 	} else {
@@ -448,8 +444,8 @@ ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails,
 	ev_sidebar_thumbnails_fill_model (sidebar_thumbnails);
 
 	/* Trigger a redraw */
-	sidebar_thumbnails->priv->start_page = 0;
-	sidebar_thumbnails->priv->end_page = 0;
+	sidebar_thumbnails->priv->start_page = -1;
+	sidebar_thumbnails->priv->end_page = -1;
 	g_idle_add ((GSourceFunc)refresh, sidebar_thumbnails);
 }
 
@@ -683,8 +679,8 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage	*sidebar_page,
 
 	/* Connect to the signal and trigger a fake callback */
 	g_signal_connect (priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), sidebar_thumbnails);
-	sidebar_thumbnails->priv->start_page = 0;
-	sidebar_thumbnails->priv->end_page = 0;
+	sidebar_thumbnails->priv->start_page = -1;
+	sidebar_thumbnails->priv->end_page = -1;
 	page_changed_cb (priv->page_cache,
 			 ev_page_cache_get_current_page (priv->page_cache),
 			 sidebar_thumbnails);
@@ -697,40 +693,39 @@ ev_sidebar_thumbnails_clear_job (GtkTreeModel *model,
 			         GtkTreeIter *iter, 											                                              
 				 gpointer data)
 {
-    EvJob *job;
-    
-    gtk_tree_model_get (model, iter, COLUMN_JOB, &job, -1);
-    
-    if (job != NULL) {
-        ev_job_queue_remove_job (job);
-	g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, data);
-    	g_object_unref (job);
-    }
-
-    return FALSE;    
+	EvJob *job;
+	
+	gtk_tree_model_get (model, iter, COLUMN_JOB, &job, -1);
+	
+	if (job != NULL) {
+		ev_job_queue_remove_job (job);
+		g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, data);
+		g_object_unref (job);
+	}
+	
+	return FALSE;    
 }
 
 static void 
 ev_sidebar_thumbnails_clear_model (EvSidebarThumbnails *sidebar_thumbnails)
 {
-    EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
-    
-    gtk_tree_model_foreach (GTK_TREE_MODEL (priv->list_store), ev_sidebar_thumbnails_clear_job, sidebar_thumbnails);
-    gtk_list_store_clear (priv->list_store);
+	EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
+	
+	gtk_tree_model_foreach (GTK_TREE_MODEL (priv->list_store), ev_sidebar_thumbnails_clear_job, sidebar_thumbnails);
+	gtk_list_store_clear (priv->list_store);
 }
 
 static gboolean
 ev_sidebar_thumbnails_support_document (EvSidebarPage   *sidebar_page,
 				        EvDocument *document)
 {
-	return (EV_IS_DOCUMENT_THUMBNAILS (document) &&
-		    (ev_document_get_n_pages (document) > 1));
+	return (EV_IS_DOCUMENT_THUMBNAILS (document));
 }
 
 static const gchar*
 ev_sidebar_thumbnails_get_label (EvSidebarPage *sidebar_page)
 {
-    return _("Thumbnails");
+	return _("Thumbnails");
 }
 
 static void