Rebase from master

This commit is contained in:
Moritz Lipp 2010-05-18 01:01:52 +02:00
parent b33e33fd36
commit af4a487da7

View File

@ -3070,7 +3070,6 @@ gboolean cb_draw(GtkWidget* widget, GdkEventExpose* expose, gpointer data)
gdk_window_clear(widget->window);
cairo_t *cairo = gdk_cairo_create(widget->window);
<<<<<<< HEAD
double page_width, page_height, width, height;
double scale = ((double) Zathura.PDF.scale / 100.0);
@ -3112,8 +3111,6 @@ gboolean cb_draw(GtkWidget* widget, GdkEventExpose* expose, gpointer data)
Zathura.Search.draw = FALSE;
}
calculate_offset(widget, &offset_x, &offset_y);
cairo_set_source_surface(cairo, Zathura.PDF.surface, offset_x, offset_y);
cairo_paint(cairo);
cairo_destroy(cairo);