#endif
#include <string.h>
-#include <gtk/gtk.h>
+
#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#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
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);
}
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;
-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),
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);
/* 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,
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);
if (sidebar_thumbnails->priv->loading_icon)
g_object_unref (sidebar_thumbnails->priv->loading_icon);
- if (sidebar_thumbnails->priv->document) {
- gint width = THUMBNAIL_WIDTH;
- gint height;
- gint page_width, page_height;
+ 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
* 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 {
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);
}
/* 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);
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
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff