double scale;
int width;
int height;
+ GtkBorder border;
+ gboolean show_border;
};
struct _EvViewClass {
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);
}
EvDocument *document = view->document;
GtkWidget *widget = GTK_WIDGET (view);
int width, height, target_width, target_height;
- GtkBorder border;
g_return_if_fail (EV_IS_DOCUMENT (document));
view->scale,
&width, &height);
- ev_document_misc_get_page_border_size (width, height, &border);
-
*x_offset = view->spacing;
*y_offset = view->spacing;
- target_width = width + border.left + border.right + view->spacing * 2;
- target_height = height + border.top + border.bottom + view->spacing * 2;
+ target_width = width + view->border.left +
+ view->border.right + view->spacing * 2;
+ target_height = height + view->border.top +
+ view->border.bottom + view->spacing * 2;
*x_offset += MAX (0, (widget->allocation.width - target_width) / 2);
*y_offset += MAX (0, (widget->allocation.height - target_height) / 2);
}
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)
{
&doc_width,
&doc_height);
- /* FIXME: The border size isn't constant. Ugh. Still, if we have extra
- * space, we just cut it from the border */
- 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;
if (view->width >= 0) {
int target_width;
- target_width = view->width - (view->spacing * 2 + border.left + border.right);
+ target_width = view->width - (view->spacing * 2 + view->border.left +
+ view->border.right);
scale = scale_w = (double)target_width / doc_width;
}
if (view->height >= 0) {
int target_height;
- target_height = view->height - (view->spacing * 2 + border.top + border.bottom);
+ target_height = view->height - (view->spacing * 2 + view->border.top +
+ view->border.bottom);
scale = scale_h = (double)target_height / doc_height;
}
GtkRequisition *requisition)
{
EvView *view = EV_VIEW (widget);
- GtkBorder border;
gint width, height;
if (!GTK_WIDGET_REALIZED (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, &border);
if (view->width >= 0) {
requisition->width = 0;
} else {
- requisition->width = width + border.left + border.right +
- view->spacing * 2;
+ requisition->width = width + view->border.left +
+ view->border.right + view->spacing * 2;
}
if (view->height >= 0) {
requisition->height = 0;
} else {
- requisition->height = height + border.top + border.bottom +
- view->spacing * 2;
+ requisition->height = height + view->border.top +
+ view->border.bottom + view->spacing * 2;
}
}
GdkEventExpose *event)
{
EvView *view = EV_VIEW (widget);
- GtkBorder border;
gint width, height;
GdkRectangle area;
int x_offset, y_offset;
view->scale,
&width, &height);
- ev_document_misc_get_page_border_size (width, height, &border);
-
/* Paint the frame */
area.x = x_offset;
area.y = y_offset;
- area.width = width + border.left + border.right;
- area.height = height + border.top + border.bottom;
- ev_document_misc_paint_one_page (view->bin_window, widget, &area, &border);
+ area.width = width + view->border.left + view->border.right;
+ area.height = height + view->border.top + view->border.bottom;
+
+ 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",
GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL],
scaled_image,
0, 0,
- area.x + border.left,
- area.y + border.top,
+ area.x + view->border.left,
+ area.y + view->border.top,
width, height,
GDK_RGB_DITHER_NORMAL,
0, 0);
GdkRectangle selection;
int width, height;
int x_offset, y_offset;
- GtkBorder border;
g_return_if_fail (EV_IS_VIEW (ev_view));
ev_view->current_page,
ev_view->scale,
&width, &height);
- ev_document_misc_get_page_border_size (width, height, &border);
ev_view->has_selection = TRUE;
- selection.x = x_offset + border.left;
- selection.y = y_offset + border.top;
+ selection.x = x_offset + ev_view->border.left;
+ selection.y = y_offset + ev_view->border.top;
selection.width = width;
selection.height = height;
view_rect_to_doc_rect (ev_view, &selection, &ev_view->selection);
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,
gint *x_offset,
gint *y_offset)
{
- GtkBorder border;
gint width, height;
ev_page_cache_get_size (view->page_cache,
view->current_page,
view->scale,
&width, &height);
- ev_document_misc_get_page_border_size (width, height, &border);
- x -= (border.left + view->spacing);
- y -= (border.top + view->spacing);
+ x -= (view->border.left + view->spacing);
+ y -= (view->border.top + view->spacing);
if ((x < 0) || (y < 0) ||
(x >= width) || (y >= height)) {
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)
link = get_link_at_location (view, event->x, event->y);
if (link) {
- ev_view_go_to_link (view, link);
+ go_to_link (view, link);
}
}
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
old_page,
view->scale,
&old_width, &old_height);
- ev_page_cache_get_size (page_cache,
- new_page,
- view->scale,
- &new_width, &new_height);
-
- if (view->cursor != EV_VIEW_CURSOR_HIDDEN) {
- //ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);
- }
view->current_page = new_page;
view->has_selection = FALSE;
compute_zoom_factor (view);
+ ev_page_cache_get_size (page_cache,
+ new_page,
+ view->scale,
+ &new_width, &new_height);
+
+ compute_border (view, new_width, new_height, &(view->border));
+
ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
view->current_page,
view->current_page,
}
}
-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,
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff