X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar-thumbnails.c;h=6ed20a21753a020769684b7b6f654577ea50f6e0;hb=35d62ea876842860caba5afe60898681d4d7dbbd;hp=c2c07c84f51a285d263b392effb394744168e90f;hpb=9d27e7230863e75f2530e4942fd6a0c19107d30f;p=evince.git

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index c2c07c84..6ed20a21 100644
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -57,6 +57,8 @@ struct _EvSidebarThumbnailsPrivate {
 
 	gint n_pages, pages_done;
 
+	int rotation;
+
 	/* Visible pages */
 	gint start_page, end_page;
 };
@@ -116,9 +118,9 @@ ev_sidebar_thumbnails_dispose (GObject *object)
 
 static void
 ev_sidebar_thumbnails_get_property (GObject    *object,
-			  	         guint       prop_id,
-			    		 GValue     *value,
-			    		 GParamSpec *pspec)
+				    guint       prop_id,
+				    GValue     *value,
+				    GParamSpec *pspec)
 {
 	EvSidebarThumbnails *sidebar = EV_SIDEBAR_THUMBNAILS (object);
 
@@ -229,7 +231,8 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails,
 				    -1);
 
 		if (job == NULL && !thumbnail_set) {
-			job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, THUMBNAIL_WIDTH);
+			/* FIXME: Need rotation */
+			job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, priv->rotation, THUMBNAIL_WIDTH);
 			ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);
 			g_object_set_data_full (G_OBJECT (job), "tree_iter",
 						gtk_tree_iter_copy (&iter),
@@ -307,7 +310,8 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
 #ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE
 		if (! GTK_WIDGET_REALIZED (priv->icon_view))
 			return;
-		gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2);
+		if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
+			return;
 #else
 		g_assert_not_reached ();
 #endif
@@ -353,11 +357,47 @@ 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) {
+		/* We get the dimensions of the first doc 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),
+						       0, THUMBNAIL_WIDTH, &width, &height);
+		ev_document_doc_mutex_unlock ();
+		sidebar_thumbnails->priv->loading_icon =
+			ev_document_misc_get_thumbnail_frame (width, height, sidebar_thumbnails->priv->rotation, NULL);
+	} else {
+		sidebar_thumbnails->priv->loading_icon = NULL;
+	}
+
+}
 void
-ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails)
+ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails,
+
+			       int                  rotation)
 {
+	sidebar_thumbnails->priv->rotation = rotation;
+	ev_sidebar_thumbnails_set_loading_icon (sidebar_thumbnails);
+
+	if (sidebar_thumbnails->priv->document == NULL)
+		return;
+
 	ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
 	ev_sidebar_thumbnails_fill_model (sidebar_thumbnails);
+
+	/* Trigger a redraw */
+	sidebar_thumbnails->priv->start_page = 0;
+	sidebar_thumbnails->priv->end_page = 0;
 	adjustment_changed_cb (sidebar_thumbnails);
 }
 
@@ -543,8 +583,6 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage	*sidebar_page,
 				    EvDocument          *document)
 {
 	EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (sidebar_page);
-	gint width = THUMBNAIL_WIDTH;
-	gint height = THUMBNAIL_WIDTH;
 
 	EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
 
@@ -554,16 +592,7 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage	*sidebar_page,
 	priv->document = document;
 	priv->n_pages = ev_page_cache_get_n_pages (priv->page_cache);
 
-	/* We get the dimensions of the first doc so that we can make a blank
-	 * icon.  */
-	ev_document_doc_mutex_lock ();
-	ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (priv->document),
-					       0, THUMBNAIL_WIDTH, &width, &height);
-	ev_document_doc_mutex_unlock ();
-
-	if (priv->loading_icon)
-		g_object_unref (priv->loading_icon);
-	priv->loading_icon = ev_document_misc_get_thumbnail_frame (width, height, NULL);
+	ev_sidebar_thumbnails_set_loading_icon (sidebar_thumbnails);
 
 	ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
 	ev_sidebar_thumbnails_fill_model (sidebar_thumbnails);
@@ -593,6 +622,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;
 	adjustment_changed_cb (sidebar_thumbnails);
 }