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=ec831491b742fd709e605a9f943b77d4b62bdd81;hb=refs%2Ftags%2FEVINCE_0_5_5;hp=f992d87e1873f852b864ba46d66d66983fcf521e;hpb=96ab01a78dafd62f121b11010a9857cbd9a7922c;p=evince.git diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index f992d87e..ec831491 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; }; @@ -100,13 +102,13 @@ ev_sidebar_thumbnails_dispose (GObject *object) { EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object); - ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); if (sidebar_thumbnails->priv->loading_icon) { g_object_unref (sidebar_thumbnails->priv->loading_icon); sidebar_thumbnails->priv->loading_icon = NULL; } if (sidebar_thumbnails->priv->list_store) { + ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); g_object_unref (sidebar_thumbnails->priv->list_store); sidebar_thumbnails->priv->list_store = NULL; } @@ -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,8 +231,8 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails, -1); if (job == NULL && !thumbnail_set) { - job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, THUMBNAIL_WIDTH, - EV_ORIENTATION_PORTRAIT); + /* 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), @@ -305,13 +307,10 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails) 1, wy2 -1, &path2, NULL, NULL, NULL); } else if (priv->icon_view) { -#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); -#else - g_assert_not_reached (); -#endif + if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2)) + return; } else { return; } @@ -354,11 +353,46 @@ 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); } @@ -456,14 +490,10 @@ ev_sidebar_init_icon_view (EvSidebarThumbnails *ev_sidebar_thumbnails) static gboolean ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails) { -#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; if (ev_page_cache_get_n_pages (priv->page_cache) > MAX_ICON_VIEW_PAGE_COUNT) return FALSE; return TRUE; -#else - return FALSE; -#endif } static void @@ -513,11 +543,8 @@ page_changed_cb (EvPageCache *page_cache, gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0.0, 0.0); } else if (sidebar->priv->icon_view) { - /* Guard against gtk-2.6 */ -#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE gtk_icon_view_select_path (GTK_ICON_VIEW (sidebar->priv->icon_view), path); gtk_icon_view_set_cursor (GTK_ICON_VIEW (sidebar->priv->icon_view), path, NULL, FALSE); -#endif } gtk_tree_path_free (path); @@ -544,8 +571,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; @@ -555,16 +580,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); @@ -579,6 +595,8 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, if (! priv->icon_view) { ev_sidebar_init_icon_view (sidebar_thumbnails); g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget"); + } else { + gtk_widget_queue_resize (priv->icon_view); } } else { if (priv->icon_view) { @@ -594,6 +612,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); }