gtk+ r19953 - in branches/gtk-2-12: . demos/gtk-demo

[bratsche svn gnome org]

Author: bratsche
Date: Mon Mar 31 22:47:57 2008
New Revision: 19953
URL: http://svn.gnome.org/viewvc/gtk+?rev=19953&view=rev

Log:
2008-03-31  Cody Russell  <bratsche gnome org>

        Merged from trunk:

        * demos/gtk-demo/printing.c (draw_page): Move down each line in
        units of text_height rather than in units of data->font_size.
        (totally awesome catch by Dom Lachowicz)



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/demos/gtk-demo/printing.c

Modified: branches/gtk-2-12/demos/gtk-demo/printing.c
==============================================================================
--- branches/gtk-2-12/demos/gtk-demo/printing.c	(original)
+++ branches/gtk-2-12/demos/gtk-demo/printing.c	Mon Mar 31 22:47:57 2008
@@ -49,6 +49,7 @@
   
   data->num_lines = i;
   data->num_pages = (data->num_lines - 1) / data->lines_per_page + 1;
+
   gtk_print_operation_set_n_pages (operation, data->num_pages);
 }
 
@@ -122,7 +123,7 @@
     {
       pango_layout_set_text (layout, data->lines[line], -1);
       pango_cairo_show_layout (cr, layout);
-      cairo_rel_move_to (cr, 0, data->font_size);
+      cairo_rel_move_to (cr, 0, text_height);
       line++;
     }