#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
GtkWidget *tree_view;
GtkAdjustment *vadjustment;
GtkListStore *list_store;
- GdkPixbuf *loading_icon;
+ GHashTable *loading_icons;
EvDocument *document;
EvPageCache *page_cache;
{
EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object);
- if (sidebar_thumbnails->priv->loading_icon) {
- g_object_unref (sidebar_thumbnails->priv->loading_icon);
- sidebar_thumbnails->priv->loading_icon = NULL;
+ if (sidebar_thumbnails->priv->loading_icons) {
+ g_hash_table_destroy (sidebar_thumbnails->priv->loading_icons);
+ sidebar_thumbnails->priv->loading_icons = NULL;
}
if (sidebar_thumbnails->priv->list_store) {
return ev_sidebar_thumbnails;
}
+static GdkPixbuf *
+ev_sidebar_thumbnails_get_loading_icon (EvSidebarThumbnails *sidebar_thumbnails,
+ gint width,
+ gint height)
+{
+ GdkPixbuf *icon;
+ gchar *key;
+
+ key = g_strdup_printf ("%dx%d", width, height);
+ icon = g_hash_table_lookup (sidebar_thumbnails->priv->loading_icons, key);
+ if (!icon) {
+ icon = ev_document_misc_get_thumbnail_frame (width, height, NULL);
+ g_hash_table_insert (sidebar_thumbnails->priv->loading_icons,
+ key, icon);
+ } else {
+ g_free (key);
+ }
+
+ return icon;
+}
+
static void
clear_range (EvSidebarThumbnails *sidebar_thumbnails,
gint start_page,
GtkTreePath *path;
GtkTreeIter iter;
gboolean result;
+ gint prev_width = -1;
+ gint prev_height = -1;
g_assert (start_page <= end_page);
result && start_page <= end_page;
result = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), &iter), start_page ++) {
EvJobThumbnail *job;
+ GdkPixbuf *loading_icon = NULL;
+ gint width, height;
gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store),
&iter,
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);
}
+ ev_page_cache_get_thumbnail_size (priv->page_cache, start_page,
+ priv->rotation,
+ &width, &height);
+ if (!loading_icon || (width != prev_width && height != prev_height)) {
+ loading_icon =
+ ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails,
+ width, height);
+ }
+
+ prev_width = width;
+ prev_height = height;
+
gtk_list_store_set (priv->list_store, &iter,
COLUMN_JOB, NULL,
COLUMN_THUMBNAIL_SET, FALSE,
- COLUMN_PIXBUF, priv->loading_icon,
+ COLUMN_PIXBUF, loading_icon,
-1);
}
gtk_tree_path_free (path);
}
+static gdouble
+get_scale_for_page (EvSidebarThumbnails *sidebar_thumbnails,
+ gint page)
+{
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
+ gint width, height;
+
+ ev_page_cache_get_size (priv->page_cache,
+ page, 0,
+ 1.0, &width, &height);
+
+ return (gdouble)THUMBNAIL_WIDTH / (gdouble)width;
+}
+
static void
add_range (EvSidebarThumbnails *sidebar_thumbnails,
gint start_page,
for (result = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->list_store), &iter, path);
result && page <= end_page;
result = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), &iter), page ++) {
- EvJobThumbnail *job;
+ EvJob *job;
gboolean thumbnail_set;
gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), &iter,
-1);
if (job == NULL && !thumbnail_set) {
- /* 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);
+ job = ev_job_thumbnail_new (priv->document,
+ page, priv->rotation,
+ get_scale_for_page (sidebar_thumbnails, page));
+ 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),
(GDestroyNotify) gtk_tree_iter_free);
gtk_list_store_set (priv->list_store, &iter,
COLUMN_JOB, job,
-1);
+
/* The queue and the list own a ref to the job now */
g_object_unref (job);
} else if (job) {
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;
- gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view),
- 0, (int) priv->vadjustment->value,
- NULL, &wy1);
- gtk_tree_view_tree_to_widget_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);
gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view),
1, wy1 + 1, &path,
NULL, NULL, NULL);
return;
}
- if (path == NULL)
- path = gtk_tree_path_new_first ();
- if (path2 == NULL)
- path2 = gtk_tree_path_new_from_indices (priv->n_pages,
- -1);
- update_visible_range (sidebar_thumbnails,
- gtk_tree_path_get_indices (path)[0],
- gtk_tree_path_get_indices (path2)[0]);
+ if (path && path2) {
+ update_visible_range (sidebar_thumbnails,
+ gtk_tree_path_get_indices (path)[0],
+ gtk_tree_path_get_indices (path2)[0]);
+ }
gtk_tree_path_free (path);
gtk_tree_path_free (path2);
EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
GtkTreeIter iter;
int i;
+ gint prev_width = -1;
+ gint prev_height = -1;
for (i = 0; i < sidebar_thumbnails->priv->n_pages; i++) {
- gchar *page_label;
- gchar *page_string;
+ gchar *page_label;
+ gchar *page_string;
+ GdkPixbuf *loading_icon = NULL;
+ gint width, height;
page_label = ev_page_cache_get_page_label (priv->page_cache, i);
page_string = g_markup_printf_escaped ("<i>%s</i>", page_label);
+ ev_page_cache_get_thumbnail_size (sidebar_thumbnails->priv->page_cache, i,
+ sidebar_thumbnails->priv->rotation,
+ &width, &height);
+ if (!loading_icon || (width != prev_width && height != prev_height)) {
+ loading_icon =
+ ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails,
+ width, height);
+ }
+ prev_width = width;
+ prev_height = height;
+
gtk_list_store_append (priv->list_store, &iter);
gtk_list_store_set (priv->list_store, &iter,
COLUMN_PAGE_STRING, page_string,
- COLUMN_PIXBUF, priv->loading_icon,
+ COLUMN_PIXBUF, loading_icon,
COLUMN_THUMBNAIL_SET, FALSE,
-1);
g_free (page_label);
}
}
-
-static void
-ev_sidebar_thumbnails_set_loading_icon (EvSidebarThumbnails *sidebar_thumbnails)
+static gboolean
+refresh (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;
- }
-
+ adjustment_changed_cb (sidebar_thumbnails);
+ return FALSE;
}
void
int rotation)
{
sidebar_thumbnails->priv->rotation = rotation;
- ev_sidebar_thumbnails_set_loading_icon (sidebar_thumbnails);
+ if (sidebar_thumbnails->priv->loading_icons)
+ g_hash_table_remove_all (sidebar_thumbnails->priv->loading_icons);
- 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;
- adjustment_changed_cb (sidebar_thumbnails);
+ sidebar_thumbnails->priv->start_page = -1;
+ sidebar_thumbnails->priv->end_page = -1;
+ g_idle_add ((GSourceFunc)refresh, sidebar_thumbnails);
}
static void
EV_TYPE_JOB_THUMBNAIL);
priv->swindow = gtk_scrolled_window_new (NULL, NULL);
+
+ /* We actually don't want GTK_POLICY_AUTOMATIC for horizontal scrollbar here
+ * it's just a workaround for bug #449462
+ */
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->swindow),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->swindow),
GTK_SHADOW_IN);
priv->vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->swindow));
priv->page_cache = ev_page_cache_get (document);
priv->document = document;
priv->n_pages = ev_page_cache_get_n_pages (priv->page_cache);
-
- ev_sidebar_thumbnails_set_loading_icon (sidebar_thumbnails);
+ priv->loading_icons = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify)g_free,
+ (GDestroyNotify)g_object_unref);
ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
ev_sidebar_thumbnails_fill_model (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);
adjustment_changed_cb (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