almanah r125 - in trunk: . src

[pwithnall svn gnome org]

Author: pwithnall
Date: Wed Dec 24 23:11:11 2008
New Revision: 125
URL: http://svn.gnome.org/viewvc/almanah?rev=125&view=rev

Log:
2008-12-24  Philip Withnall  <philip tecnocode co uk>

	* src/printing.c (print_entry): Add a default margin of 20px 
when
	printing. (Closes: #564706)



Modified:
   trunk/ChangeLog
   trunk/src/printing.c

Modified: trunk/src/printing.c
==============================================================================
--- trunk/src/printing.c	(original)
+++ trunk/src/printing.c	Wed Dec 24 23:11:11 2008
@@ -28,6 +28,7 @@
 #define TITLE_MARGIN_BOTTOM 15 /* margin under the title, in pixels */
 #define ENTRY_MARGIN_BOTTOM 10 /* margin under the entry, in pixels */
 #define MAX_ORPHANS 3 /* maximum number of orphan lines to be forced to the next page */
+#define PAGE_MARGIN 20 /* left- and right-hand page margin size, in pixels */
 
 typedef struct {
 	GtkTextBuffer *buffer;
@@ -249,7 +250,7 @@
 	if (almanah_operation->current_line == 0) {
 		/* Set up the title layout */
 		title_layout = gtk_print_context_create_pango_layout (context);
-		pango_layout_set_width (title_layout, gtk_print_context_get_width (context) * PANGO_SCALE);
+		pango_layout_set_width (title_layout, (gtk_print_context_get_width (context) - 2 * PAGE_MARGIN) * PANGO_SCALE);
 
 		/* Translators: This is a strftime()-format string for the date displayed above each printed entry. */
 		g_date_strftime (title, sizeof (title), _("%A, %e %B %Y"), almanah_operation->current_date);
@@ -264,7 +265,7 @@
 
 	/* Set up the entry layout */
 	entry_layout = gtk_print_context_create_pango_layout (context);
-	pango_layout_set_width (entry_layout, gtk_print_context_get_width (context) * PANGO_SCALE);
+	pango_layout_set_width (entry_layout, (gtk_print_context_get_width (context) - 2 * PAGE_MARGIN) * PANGO_SCALE);
 	pango_layout_set_ellipsize (entry_layout, PANGO_ELLIPSIZE_NONE);
 
 	entry = almanah_storage_manager_get_entry (almanah->storage_manager, almanah_operation->current_date);
@@ -305,7 +306,7 @@
 
 		if (almanah_operation->current_line == 0) {
 			/* Draw the title */
-			cairo_move_to (cr, 0, title_y);
+			cairo_move_to (cr, PAGE_MARGIN, title_y);
 			pango_cairo_show_layout (cr, title_layout);
 		}
 	}
@@ -331,7 +332,7 @@
 
 		if (almanah_operation->paginated == TRUE) {
 			/* Draw the entry line */
-			cairo_move_to (cr, 0, entry_y);
+			cairo_move_to (cr, PAGE_MARGIN, entry_y);
 			pango_cairo_show_layout_line (cr, entry_line);
 		}