ooops. Fix ChangeLog. Sorry.

[evince.git] / shell / ev-view.c

diff --git a/shell/ev-view.c b/shell/ev-view.c
index b11a4bc2d77c1c0ecf248406a046af4469753afb..b51082f24dfde8aada92f9c383fe296bb24cfd49 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -115,6 +115,7 @@ struct _EvView {
        int width;
        int height;
        GtkBorder border;
+       gboolean show_border;
 };
 
 struct _EvViewClass {
@@ -209,8 +210,8 @@ ev_view_finalize (GObject *object)
 
        LOG ("Finalize");
 
-
-       ev_view_set_scroll_adjustments (view, NULL, NULL);
+       g_free (view->status);
+       g_free (view->find_status);
 
        G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
 }
@@ -281,6 +282,19 @@ doc_rect_to_view_rect (EvView *view, EvRectangle *doc_rect, GdkRectangle *view_r
        view_rect->height = ceil (doc_rect->y2 * view->scale) + y_offset - view_rect->y;
 }
 
+static void
+compute_border (EvView *view, int width, int height, GtkBorder *border)
+{
+       if (view->show_border) {
+               ev_document_misc_get_page_border_size (width, height, border);
+       } else {
+               border->left = 0;
+               border->right = 0;
+               border->top = 0;
+               border->bottom = 0;
+       }
+}
+
 static void
 compute_zoom_factor (EvView *view)
 {
@@ -300,7 +314,7 @@ compute_zoom_factor (EvView *view)
                                &doc_width,
                                &doc_height);
 
-       ev_document_misc_get_page_border_size (doc_width, doc_height, &border);
+       compute_border (view, doc_width, doc_height, &border);
 
        if (doc_width == 0 || doc_height == 0) {
                return;
@@ -354,11 +368,12 @@ ev_view_size_request (GtkWidget      *widget,
                                view->scale,
                                &width, &height);
 
+       compute_border (view, width, height, &(view->border));
+
        ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
                                        view->current_page,
                                        view->current_page,
                                        view->scale);
-       ev_document_misc_get_page_border_size (width, height, &(view->border));
 
        if (view->width >= 0) {
                requisition->width = 0;
@@ -569,8 +584,11 @@ expose_bin_window (GtkWidget      *widget,
        area.y = y_offset;
        area.width = width + view->border.left + view->border.right;
        area.height = height + view->border.top + view->border.bottom;
-       ev_document_misc_paint_one_page (view->bin_window, widget, &area,
-                                        &(view->border));
+
+       if (view->show_border) {
+               ev_document_misc_paint_one_page (view->bin_window, widget, &area,
+                                                &(view->border));
+       }
 
        /* Render the document itself */
        LOG ("Render area %d %d %d %d - Offset %d %d",
@@ -680,6 +698,16 @@ ev_view_copy (EvView *ev_view)
        g_free (text);
 }
 
+void
+ev_view_set_show_border (EvView *view, gboolean show_border)
+{
+       g_return_if_fail (EV_IS_VIEW (view));
+
+       view->show_border = show_border;
+
+       gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
 static void
 ev_view_primary_get_cb (GtkClipboard     *clipboard,
                        GtkSelectionData *selection_data,
@@ -947,6 +975,31 @@ ev_view_motion_notify_event (GtkWidget      *widget,
        return TRUE;
 }
 
+/* FIXME: standardize this sometime */
+static void
+go_to_link (EvView *view, EvLink *link)
+{
+       EvLinkType type;
+       const char *uri;
+       int page;
+
+       type = ev_link_get_link_type (link);
+
+       switch (type) {
+               case EV_LINK_TYPE_TITLE:
+                       break;
+               case EV_LINK_TYPE_PAGE:
+                       page = ev_link_get_page (link);
+                       ev_page_cache_set_current_page (view->page_cache, page);
+                       break;
+               case EV_LINK_TYPE_EXTERNAL_URI:
+                       uri = ev_link_get_uri (link);
+                       gnome_vfs_url_show (uri);
+                       break;
+       }
+}
+
+
 static gboolean
 ev_view_button_release_event (GtkWidget      *widget,
                              GdkEventButton *event)
@@ -962,7 +1015,7 @@ ev_view_button_release_event (GtkWidget      *widget,
 
                link = get_link_at_location (view, event->x, event->y);
                if (link) {
-                       ev_view_go_to_link (view, link);
+                       go_to_link (view, link);
                }
        }
 
@@ -1257,16 +1310,30 @@ ev_view_class_init (EvViewClass *class)
        add_scroll_binding_shifted (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, EV_SCROLL_PAGE_FORWARD, FALSE);
 }
 
+void
+ev_view_set_spacing (EvView     *view,
+                    int         spacing)
+{
+       g_return_if_fail (EV_IS_VIEW (view));
+
+       view->spacing = spacing;
+
+       if (view->document) {
+               gtk_widget_queue_resize (GTK_WIDGET (view));
+       }
+}
+
 static void
 ev_view_init (EvView *view)
 {
        GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
 
-       view->spacing = 10;
+       view->spacing = 0;
        view->scale = 1.0;
        view->current_page = 0;
        view->pressed_button = -1;
        view->cursor = EV_VIEW_CURSOR_NORMAL;
+       view->show_border = TRUE;
 }
 
 static void
@@ -1451,8 +1518,7 @@ page_changed_cb (EvPageCache *page_cache,
                                view->scale,
                                &new_width, &new_height);
 
-       ev_document_misc_get_page_border_size
-               (new_width, new_height, &(view->border));
+       compute_border (view, new_width, new_height, &(view->border));
 
        ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
                                        view->current_page,
@@ -1512,41 +1578,6 @@ ev_view_set_document (EvView     *view,
        }
 }
 
-int
-ev_view_get_page        (EvView     *view)
-{
-       return view->current_page;
-}
-
-static void
-go_to_link (EvView *view, EvLink *link)
-{
-       EvLinkType type;
-       const char *uri;
-       int page;
-
-       type = ev_link_get_link_type (link);
-
-       switch (type) {
-               case EV_LINK_TYPE_TITLE:
-                       break;
-               case EV_LINK_TYPE_PAGE:
-                       page = ev_link_get_page (link);
-                       ev_page_cache_set_current_page (view->page_cache, page);
-                       break;
-               case EV_LINK_TYPE_EXTERNAL_URI:
-                       uri = ev_link_get_uri (link);
-                       gnome_vfs_url_show (uri);
-                       break;
-       }
-}
-
-void
-ev_view_go_to_link (EvView *view, EvLink *link)
-{
-       go_to_link (view, link);
-}
-
 static void
 ev_view_zoom (EvView   *view,
              double    factor,