X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=3eed46a803bfe54a2ab76bfe2052c0387c25f9a9;hb=6c93a5962ad7052cff3065ddbd8d53b6932d1f1b;hp=e3f07dc9e91fc1f67883d9ea01fca742a99f03b6;hpb=fdf6ceaeede339118ddc2d389ba60be8e3bae9c1;p=evince.git diff --git a/shell/ev-view.c b/shell/ev-view.c index e3f07dc9..3eed46a8 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -206,7 +206,8 @@ static void draw_one_page (EvView gint page, GdkRectangle *page_area, GtkBorder *border, - GdkRectangle *expose_area); + GdkRectangle *expose_area, + gboolean *page_ready); static void draw_loading_text (EvView *view, GdkRectangle *page_area, GdkRectangle *expose_area); @@ -385,6 +386,7 @@ view_set_adjustment_values (EvView *view, factor = 1.0; switch (view->pending_scroll) { case SCROLL_TO_KEEP_POSITION: + case SCROLL_TO_FIND_LOCATION: factor = (adjustment->value) / adjustment->upper; break; case SCROLL_TO_PAGE_POSITION: @@ -405,6 +407,7 @@ view_set_adjustment_values (EvView *view, */ switch (view->pending_scroll) { case SCROLL_TO_KEEP_POSITION: + case SCROLL_TO_FIND_LOCATION: new_value = CLAMP (adjustment->upper * factor + 0.5, 0, adjustment->upper - adjustment->page_size); gtk_adjustment_set_value (adjustment, (int)new_value); break; @@ -427,9 +430,6 @@ view_update_range_and_current_page (EvView *view) gint current_page; gint best_current_page = -1; - if (view->pending_scroll != SCROLL_TO_KEEP_POSITION) - return; - /* Presentation trumps all other modes */ if (view->presentation) { view->start_page = view->current_page; @@ -438,7 +438,7 @@ view_update_range_and_current_page (EvView *view) GdkRectangle current_area, unused, page_area; GtkBorder border; gboolean found = FALSE; - gint area_max, area; + gint area_max = -1, area; int i; if (!(view->vadjustment && view->hadjustment)) @@ -495,7 +495,7 @@ view_update_range_and_current_page (EvView *view) best_current_page = MAX (best_current_page, view->start_page); current_page = ev_page_cache_get_current_page (view->page_cache); - if (current_page != best_current_page) { + if ((current_page != best_current_page) && (view->pending_scroll == SCROLL_TO_KEEP_POSITION)) { view->current_page = best_current_page; ev_page_cache_set_current_page (view->page_cache, best_current_page); } @@ -581,7 +581,7 @@ ev_view_scroll (EvView *view, view->jump_to_find_result = FALSE; - if (view->presentation) { + if (view->presentation || view->sizing_mode == EV_SIZING_BEST_FIT) { switch (scroll) { case EV_SCROLL_PAGE_BACKWARD: case EV_SCROLL_STEP_BACKWARD: @@ -666,7 +666,7 @@ ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect) GtkAdjustment *adjustment; int value; - view->pending_scroll = SCROLL_TO_KEEP_POSITION; + view->pending_scroll = SCROLL_TO_FIND_LOCATION; adjustment = view->vadjustment; @@ -691,6 +691,8 @@ ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect) widget->allocation.width + MARGIN); gtk_adjustment_set_value (view->hadjustment, value); } + + gtk_widget_queue_resize (GTK_WIDGET (view)); } /*** Geometry computations ***/ @@ -1079,22 +1081,20 @@ static void goto_fitr_dest (EvView *view, EvLinkDest *dest) { EvPoint doc_point; - int page; double zoom; zoom = zoom_for_size_best_fit (ev_link_dest_get_right (dest) - ev_link_dest_get_left (dest), - ev_link_dest_get_top (dest) - ev_link_dest_get_bottom (dest), + ev_link_dest_get_bottom (dest) - ev_link_dest_get_top (dest), ev_view_get_width (view), ev_view_get_height (view), 0, 0); ev_view_set_sizing_mode (view, EV_SIZING_FREE); ev_view_set_zoom (view, zoom, FALSE); - page = ev_link_dest_get_page (dest); doc_point.x = ev_link_dest_get_left (dest); doc_point.y = ev_link_dest_get_top (dest); - view->current_page = page; + view->current_page = ev_link_dest_get_page (dest); view->pending_point = doc_point; view->pending_scroll = SCROLL_TO_PAGE_POSITION; @@ -1139,13 +1139,13 @@ goto_fith_dest (EvView *view, EvLinkDest *dest) ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height); doc_point.x = 0; - doc_point.y = doc_height - ev_link_dest_get_top (dest); + doc_point.y = ev_link_dest_get_top (dest); zoom = zoom_for_size_fit_width (doc_width, ev_link_dest_get_top (dest), ev_view_get_width (view), ev_view_get_height (view), 0); - ev_view_set_sizing_mode (view, EV_SIZING_FREE); + ev_view_set_sizing_mode (view, EV_SIZING_FIT_WIDTH); ev_view_set_zoom (view, zoom, FALSE); view->current_page = page; @@ -1168,7 +1168,7 @@ goto_fit_dest (EvView *view, EvLinkDest *dest) zoom = zoom_for_size_best_fit (doc_width, doc_height, ev_view_get_width (view), ev_view_get_height (view), 0, 0); - ev_view_set_sizing_mode (view, EV_SIZING_FREE); + ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT); ev_view_set_zoom (view, zoom, FALSE); view->current_page = page; @@ -1181,20 +1181,19 @@ static void goto_xyz_dest (EvView *view, EvLinkDest *dest) { EvPoint doc_point; - int height, page; + gint page; double zoom; zoom = ev_link_dest_get_zoom (dest); page = ev_link_dest_get_page (dest); - ev_page_cache_get_size (view->page_cache, page, 0, 1.0, NULL, &height); - if (zoom != 0) { + if (zoom > 1) { ev_view_set_sizing_mode (view, EV_SIZING_FREE); ev_view_set_zoom (view, zoom, FALSE); } doc_point.x = ev_link_dest_get_left (dest); - doc_point.y = height - ev_link_dest_get_top (dest); + doc_point.y = ev_link_dest_get_top (dest); view->current_page = page; view->pending_point = doc_point; @@ -1236,6 +1235,9 @@ goto_dest (EvView *view, EvLinkDest *dest) case EV_LINK_DEST_TYPE_XYZ: goto_xyz_dest (view, dest); break; + case EV_LINK_DEST_TYPE_PAGE_LABEL: + ev_page_cache_set_page_label (view->page_cache, ev_link_dest_get_page_label (dest)); + break; default: g_assert_not_reached (); } @@ -1333,15 +1335,15 @@ tip_from_action_named (EvLinkAction *action) const gchar *name = ev_link_action_get_name (action); if (g_ascii_strcasecmp (name, "FirstPage") == 0) { - return g_strdup (_("Got to fisrt page")); + return g_strdup (_("Go to first page")); } else if (g_ascii_strcasecmp (name, "PrevPage") == 0) { - return g_strdup (_("Got to previuos page")); + return g_strdup (_("Go to previous page")); } else if (g_ascii_strcasecmp (name, "NextPage") == 0) { - return g_strdup (_("Got to next page")); + return g_strdup (_("Go to next page")); } else if (g_ascii_strcasecmp (name, "LastPage") == 0) { - return g_strdup (_("Got to last page")); + return g_strdup (_("Go to last page")); } else if (g_ascii_strcasecmp (name, "GoToPage") == 0) { - return g_strdup (_("Got to page")); + return g_strdup (_("Go to page")); } else if (g_ascii_strcasecmp (name, "Find") == 0) { return g_strdup (_("Find")); } @@ -1375,10 +1377,10 @@ tip_from_link (EvView *view, EvLink *link) break; case EV_LINK_ACTION_TYPE_GOTO_REMOTE: if (title) { - msg = g_strdup_printf (_("Go to %s on file %s"), title, + msg = g_strdup_printf (_("Go to %s on file “%s”"), title, ev_link_action_get_filename (action)); } else { - msg = g_strdup_printf (_("Go to file %s"), + msg = g_strdup_printf (_("Go to file “%s”"), ev_link_action_get_filename (action)); } @@ -1609,12 +1611,12 @@ ev_view_size_allocate (GtkWidget *widget, view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL); view_set_adjustment_values (view, GTK_ORIENTATION_VERTICAL); - view->pending_scroll = SCROLL_TO_KEEP_POSITION; - view->pending_resize = FALSE; - if (view->document) view_update_range_and_current_page (view); + view->pending_scroll = SCROLL_TO_KEEP_POSITION; + view->pending_resize = FALSE; + GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); } @@ -1761,6 +1763,7 @@ ev_view_expose_event (GtkWidget *widget, for (i = view->start_page; i <= view->end_page; i++) { GdkRectangle page_area; GtkBorder border; + gboolean page_ready = TRUE; if (!get_page_extents (view, i, &page_area, &border)) continue; @@ -1768,9 +1771,9 @@ ev_view_expose_event (GtkWidget *widget, page_area.x -= view->scroll_x; page_area.y -= view->scroll_y; - draw_one_page (view, i, &page_area, &border, &(event->area)); + draw_one_page (view, i, &page_area, &border, &(event->area), &page_ready); - if (EV_IS_DOCUMENT_FIND (view->document)) + if (page_ready && EV_IS_DOCUMENT_FIND (view->document)) highlight_find_results (view, i); } @@ -2031,7 +2034,7 @@ ev_view_button_release_event (GtkWidget *widget, ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } - if (view->document) { + if (view->document && view->pressed_button == 1) { link = ev_view_get_link_at_location (view, event->x, event->y); } else { link = NULL; @@ -2225,6 +2228,12 @@ draw_loading_text (EvView *view, double real_scale; int target_width; + /* Don't annoy users with loading messages during presentations. + * FIXME: Temporary "workaround" for + * http://bugzilla.gnome.org/show_bug.cgi?id=320352 */ + if (view->presentation) + return; + const char *loading_text = _("Loading..."); layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text); @@ -2264,7 +2273,8 @@ draw_one_page (EvView *view, gint page, GdkRectangle *page_area, GtkBorder *border, - GdkRectangle *expose_area) + GdkRectangle *expose_area, + gboolean *page_ready) { gint width, height; GdkPixbuf *current_pixbuf; @@ -2274,7 +2284,7 @@ draw_one_page (EvView *view, gint current_page; g_assert (view->document); - + if (! gdk_rectangle_intersect (page_area, expose_area, &overlap)) return; @@ -2291,6 +2301,7 @@ draw_one_page (EvView *view, real_page_area.y += border->top; real_page_area.width -= (border->left + border->right); real_page_area.height -= (border->top + border->bottom); + *page_ready = TRUE; ev_document_misc_paint_one_page (GTK_WIDGET(view)->window, GTK_WIDGET (view), @@ -2350,6 +2361,7 @@ draw_one_page (EvView *view, draw_loading_text (view, &real_page_area, expose_area); + *page_ready = FALSE; } if (scaled_selection) { @@ -2401,6 +2413,7 @@ ev_view_destroy (GtkObject *object) if (view->link_tooltip) { gtk_widget_destroy (view->link_tooltip); + view->link_tooltip = NULL; } if (view->selection_scroll_id) { @@ -4124,6 +4137,9 @@ ev_view_next_page (EvView *view) int page; g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + + if (!view->page_cache) + return FALSE; page = ev_page_cache_get_current_page (view->page_cache); @@ -4150,6 +4166,9 @@ ev_view_previous_page (EvView *view) g_return_val_if_fail (EV_IS_VIEW (view), FALSE); + if (!view->page_cache) + return FALSE; + page = ev_page_cache_get_current_page (view->page_cache); if (view->dual_page && !view->presentation)