AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

printing: Fix origin for scaled, rotated pages

Browse Source 
The calls to cairo_translate in
_gtk_print_context_rotate_according_to_orientation,
_gtk_print_context_reverse_according_to_orientation and
_gtk_print_context_translate_into_margin assume an unscaled context.
These functions should therefore be called before scaling the context,
otherwise the origin does not always end up in the top left corner.

https://bugzilla.gnome.org/show_bug.cgi?id=740742
This commit is contained in:
Leo Wolf 2014-11-26 20:18:36 +00:00 committed by Marek Kasik
parent 732af31424
commit c85c3510e7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkprintoperation.c
View File

@ -2488,17 +2488,22 @@ common_render_page (GtkPrintOperation *op,
cr = gtk_print_context_get_cairo_context (print_context);
cairo_save (cr);
if (priv->manual_scale != 1.0 && priv->manual_number_up <= 1)
cairo_scale (cr,
priv->manual_scale,
priv->manual_scale);
if (priv->manual_orientation)
_gtk_print_context_rotate_according_to_orientation (print_context);
else
_gtk_print_context_reverse_according_to_orientation (print_context);
if (priv->manual_number_up > 1)
if (priv->manual_number_up <= 1)
{
if (!priv->use_full_page)
_gtk_print_context_translate_into_margin (print_context);
if (priv->manual_scale != 1.0)
cairo_scale (cr,
priv->manual_scale,
priv->manual_scale);
}
else
{
GtkPageOrientation orientation;
GtkPageSetup *page_setup;
@ -2678,9 +2683,6 @@ common_render_page (GtkPrintOperation *op,
cairo_rotate (cr, - G_PI / 2);
}
}
else
if (!priv->use_full_page)
_gtk_print_context_translate_into_margin (print_context);
priv->page_drawing_state = GTK_PAGE_DRAWING_STATE_DRAWING;