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=01c996bb48f446413cbdbcfca69d711a829c84c7;hb=d47bc2205d248b34dbfcdd349473f54d45d5ec70;hp=362ef48028d53ccf669ee6232b8f7259aa69dd0f;hpb=2f1494f465ee651cb78bdf8f365ad45f33957ba6;p=evince.git diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 362ef480..01c996bb 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; }; @@ -83,6 +85,7 @@ static void ev_sidebar_thumbnails_set_document (EvSidebarPage static const gchar* ev_sidebar_thumbnails_get_label (EvSidebarPage *sidebar_page); static void thumbnail_job_completed_callback (EvJobThumbnail *job, EvSidebarThumbnails *sidebar_thumbnails); +static void adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails); G_DEFINE_TYPE_EXTENDED (EvSidebarThumbnails, ev_sidebar_thumbnails, @@ -100,13 +103,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; } @@ -122,8 +125,7 @@ ev_sidebar_thumbnails_get_property (GObject *object, { EvSidebarThumbnails *sidebar = EV_SIDEBAR_THUMBNAILS (object); - switch (prop_id) - { + switch (prop_id) { case PROP_WIDGET: if (sidebar->priv->tree_view) g_value_set_object (value, sidebar->priv->tree_view); @@ -136,17 +138,32 @@ ev_sidebar_thumbnails_get_property (GObject *object, } } +static void +ev_sidebar_thumbnails_map (GtkWidget *widget) +{ + EvSidebarThumbnails *sidebar; + + sidebar = EV_SIDEBAR_THUMBNAILS (widget); + + GTK_WIDGET_CLASS (ev_sidebar_thumbnails_parent_class)->map (widget); + + adjustment_changed_cb (sidebar); +} + static void ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnails_class) { GObjectClass *g_object_class; GtkObjectClass *gtk_object_class; + GtkWidgetClass *widget_class; g_object_class = G_OBJECT_CLASS (ev_sidebar_thumbnails_class); gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_thumbnails_class); + widget_class = GTK_WIDGET_CLASS (ev_sidebar_thumbnails_class); g_object_class->dispose = ev_sidebar_thumbnails_dispose; g_object_class->get_property = ev_sidebar_thumbnails_get_property; + widget_class->map = ev_sidebar_thumbnails_map; g_object_class_override_property (g_object_class, PROP_WIDGET, @@ -230,7 +247,7 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails, if (job == NULL && !thumbnail_set) { /* FIXME: Need rotation */ - job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, 0, THUMBNAIL_WIDTH); + 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), @@ -288,6 +305,10 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails) gint wy1; gint wy2; + /* Widget is not currently visible */ + if (!GTK_WIDGET_MAPPED (sidebar_thumbnails)) + return; + if (priv->tree_view) { if (! GTK_WIDGET_REALIZED (priv->tree_view)) return; @@ -305,14 +326,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; if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2)) return; -#else - g_assert_not_reached (); -#endif } else { return; } @@ -355,11 +372,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); } @@ -457,14 +509,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 @@ -514,11 +562,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); @@ -545,8 +590,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; @@ -556,16 +599,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); @@ -580,6 +614,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) { @@ -595,6 +631,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); }