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=08be12b2fab9283c86748935d9e237fd66d123cf;hb=4cec7958f9bfd4f2950bdf0b257757348b26dafc;hp=690c7de6afb42f4f264e1286989d83bb5c3c6d82;hpb=3e7d5f82187c7fc0d8515c1706aeab0bd0b44dfd;p=evince.git diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 690c7de6..08be12b2 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -27,16 +27,17 @@ #endif #include + #include #include -#include "ev-sidebar-page.h" -#include "ev-sidebar-thumbnails.h" -#include "ev-document-thumbnails.h" #include "ev-document-misc.h" +#include "ev-document-thumbnails.h" #include "ev-job-scheduler.h" -#include "ev-window.h" +#include "ev-sidebar-page.h" +#include "ev-sidebar-thumbnails.h" #include "ev-utils.h" +#include "ev-window.h" #define THUMBNAIL_WIDTH 100 @@ -51,7 +52,7 @@ struct _EvSidebarThumbnailsPrivate { GtkWidget *tree_view; GtkAdjustment *vadjustment; GtkListStore *list_store; - GdkPixbuf *loading_icon; + GHashTable *loading_icons; EvDocument *document; EvPageCache *page_cache; @@ -103,9 +104,9 @@ ev_sidebar_thumbnails_dispose (GObject *object) { 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) { @@ -182,6 +183,27 @@ ev_sidebar_thumbnails_new (void) 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, @@ -191,6 +213,8 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, GtkTreePath *path; GtkTreeIter iter; gboolean result; + gint prev_width = -1; + gint prev_height = -1; g_assert (start_page <= end_page); @@ -199,6 +223,8 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, 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, @@ -211,10 +237,22 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails, 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); @@ -325,27 +363,20 @@ 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); -#else - 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); -#endif /* GTK_CHECK_VERSION (2, 11, 3) */ - + 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); @@ -377,18 +408,33 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) 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 ("%s", 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); @@ -396,31 +442,6 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) } } - -static void -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 && - 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_thumbnail_size (sidebar_thumbnails->priv->page_cache, 0, - sidebar_thumbnails->priv->rotation, - &width, &height); - - sidebar_thumbnails->priv->loading_icon = - ev_document_misc_get_thumbnail_frame (width, height, NULL); - } else { - sidebar_thumbnails->priv->loading_icon = NULL; - } - -} - static gboolean refresh (EvSidebarThumbnails *sidebar_thumbnails) { @@ -433,7 +454,8 @@ 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->loading_icons) + g_hash_table_remove_all (sidebar_thumbnails->priv->loading_icons); if (sidebar_thumbnails->priv->document == NULL || sidebar_thumbnails->priv->n_pages <= 0) @@ -571,11 +593,11 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails) 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)); - g_signal_connect_data (G_OBJECT (priv->vadjustment), "value-changed", + g_signal_connect_data (priv->vadjustment, "value-changed", G_CALLBACK (adjustment_changed_cb), ev_sidebar_thumbnails, NULL, G_CONNECT_SWAPPED | G_CONNECT_AFTER); - g_signal_connect_swapped (G_OBJECT (priv->swindow), "size-allocate", + g_signal_connect_swapped (priv->swindow, "size-allocate", G_CALLBACK (adjustment_changed_cb), ev_sidebar_thumbnails); gtk_box_pack_start (GTK_BOX (ev_sidebar_thumbnails), priv->swindow, TRUE, TRUE, 0); @@ -645,8 +667,10 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, 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);