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=2850514bc6345160c9d4764030c70b76864f730b;hb=5e55b6b5e74175b5638337616b84527fb8286908;hp=6c20706de181396faecf1833f3ff06e293d10be0;hpb=7657f1a15f49ea7aaf6c33c10a9d22095a9187ac;p=evince.git diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 6c20706d..2850514b 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -27,16 +27,17 @@ #endif #include -#include + #include +#include +#include "ev-document-misc.h" +#include "ev-document-thumbnails.h" +#include "ev-job-scheduler.h" #include "ev-sidebar-page.h" #include "ev-sidebar-thumbnails.h" -#include "ev-document-thumbnails.h" -#include "ev-document-misc.h" -#include "ev-job-queue.h" -#include "ev-window.h" #include "ev-utils.h" +#include "ev-window.h" #define THUMBNAIL_WIDTH 100 @@ -207,7 +208,7 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, if (job) { g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, sidebar_thumbnails); - ev_job_queue_remove_job (EV_JOB (job)); + ev_job_cancel (EV_JOB (job)); g_object_unref (job); } @@ -260,13 +261,10 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails, -1); if (job == NULL && !thumbnail_set) { - EvRenderContext *rc; - - rc = ev_render_context_new (priv->rotation, page, + job = ev_job_thumbnail_new (priv->document, + page, priv->rotation, get_scale_for_page (sidebar_thumbnails, page)); - job = ev_job_thumbnail_new (priv->document, rc); - ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH); - g_object_unref (rc); + ev_job_scheduler_push_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH); g_object_set_data_full (G_OBJECT (job), "tree_iter", gtk_tree_iter_copy (&iter), @@ -304,10 +302,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); @@ -328,18 +326,21 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails) /* Widget is not currently visible */ if (!GTK_WIDGET_MAPPED (sidebar_thumbnails)) return; + + if (priv->vadjustment->page_size == 0) + return; if (priv->tree_view) { if (! GTK_WIDGET_REALIZED (priv->tree_view)) return; #if GTK_CHECK_VERSION (2, 11, 3) - gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view), - 0, (int) priv->vadjustment->value, - NULL, &wy1); - gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view), - 0, (int) (priv->vadjustment->value + priv->vadjustment->page_size), - NULL, &wy2); + gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view), + 0, (int) priv->vadjustment->value, + NULL, &wy1); + gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view), + 0, (int) (priv->vadjustment->value + priv->vadjustment->page_size), + NULL, &wy2); #else gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view), 0, (int) priv->vadjustment->value, @@ -348,7 +349,7 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails) 0, (int) (priv->vadjustment->value + priv->vadjustment->page_size), NULL, &wy2); #endif /* GTK_CHECK_VERSION (2, 11, 3) */ - + gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view), 1, wy1 + 1, &path, NULL, NULL, NULL); @@ -406,7 +407,8 @@ ev_sidebar_thumbnails_set_loading_icon (EvSidebarThumbnails *sidebar_thumbnails) if (sidebar_thumbnails->priv->loading_icon) g_object_unref (sidebar_thumbnails->priv->loading_icon); - if (sidebar_thumbnails->priv->document) { + if (sidebar_thumbnails->priv->document && + sidebar_thumbnails->priv->n_pages > 0) { gint width, height; /* We get the dimensions of the first page so that we can make a blank @@ -437,15 +439,16 @@ ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails, sidebar_thumbnails->priv->rotation = rotation; ev_sidebar_thumbnails_set_loading_icon (sidebar_thumbnails); - if (sidebar_thumbnails->priv->document == NULL) + if (sidebar_thumbnails->priv->document == NULL || + sidebar_thumbnails->priv->n_pages <= 0) 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; + sidebar_thumbnails->priv->start_page = -1; + sidebar_thumbnails->priv->end_page = -1; g_idle_add ((GSourceFunc)refresh, sidebar_thumbnails); } @@ -679,8 +682,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); @@ -689,44 +692,43 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, static gboolean ev_sidebar_thumbnails_clear_job (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, + GtkTreePath *path, + 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_cancel (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