mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Table print: Only show a table header when not 'paginating'

Browse source 
Strangely on Linux everything looks fine, but Windows shows the header
two times on the first page, which is due to the pango_cairo_show_layout()
function being called both for the 'paginating' and 'regular' stages
in show_table_header().

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2013-03-10 14:50:00 +02:00 • committed by Dirk Hohndel
parent 6c7e2f9ffa
commit a9d613640d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
print.c
View file

@ -495,7 +495,7 @@ static void show_dive_tanks(struct dive *dive, cairo_t *cr, double w,
g_object_unref (layout); g_object_unref (layout);
} }
static void show_table_header(cairo_t *cr, PangoLayout *layout, double w) static void show_table_header(cairo_t *cr, PangoLayout *layout, double w, gboolean paginate)
{ {
int i; int i;
double maxwidth, colwidth, curwidth; double maxwidth, colwidth, curwidth;
@ -514,7 +514,8 @@ static void show_table_header(cairo_t *cr, PangoLayout *layout, double w)
curwidth = curwidth + (colwidth * rel_width[i]); curwidth = curwidth + (colwidth * rel_width[i]);
pango_layout_set_text(layout, _(headers[i]), -1); pango_layout_set_text(layout, _(headers[i]), -1);
pango_layout_set_justify(layout, 0); pango_layout_set_justify(layout, 0);
pango_cairo_show_layout(cr, layout); if (!paginate)
pango_cairo_show_layout(cr, layout);
} }
cairo_move_to(cr, 0, 0); cairo_move_to(cr, 0, 0);
} }
@ -788,7 +789,7 @@ static void draw_table(GtkPrintOperation *operation, GtkPrintContext *context, g
pango_layout_get_extents(layout, NULL, &logic_ext); pango_layout_get_extents(layout, NULL, &logic_ext);
cairo_translate (cr, w/10, 2.0 * logic_ext.height / PANGO_SCALE); cairo_translate (cr, w/10, 2.0 * logic_ext.height / PANGO_SCALE);
y = 2.0 * logic_ext.height / PANGO_SCALE; y = 2.0 * logic_ext.height / PANGO_SCALE;
show_table_header(cr, layout, w*2); show_table_header(cr, layout, w*2, paginate);
set_font(layout, font, FONT_NORMAL*1.2, PANGO_ALIGN_LEFT); set_font(layout, font, FONT_NORMAL*1.2, PANGO_ALIGN_LEFT);
/* We wanted the header ellipsized but not the data */ /* We wanted the header ellipsized but not the data */
pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE); pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);