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

Separate show_dive_text() in two diferent functions.

Browse source 
Create a function show_dive_header() and show_dive_notes() as a first step
to introduce other infos in diferent funcs.

Modify print() acordingly to the new funcs.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Salvador Cuñat 2012-12-08 16:54:14 +01:00 • committed by Dirk Hohndel
parent c9a03db480
commit e1c8394d3e
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
print.c
View file

@ -45,7 +45,11 @@ static void set_font(PangoLayout *layout, PangoFontDescription *font,
* You know what? Maybe somebody can do a real Pango layout thing. * You know what? Maybe somebody can do a real Pango layout thing.
* This is hacky. * This is hacky.
*/ */
static void show_dive_text(struct dive *dive, cairo_t *cr, double w,
/*
* Show a header for the dive containing minimal data
*/
static void show_dive_header(struct dive *dive, cairo_t *cr, double w,
double h, PangoFontDescription *font) double h, PangoFontDescription *font)
{ {
double depth; double depth;
@ -126,22 +130,25 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w,
set_font(layout, font, FONT_NORMAL, PANGO_ALIGN_LEFT); set_font(layout, font, FONT_NORMAL, PANGO_ALIGN_LEFT);
} }
pango_layout_set_text(layout, dive->location ? : " ", -1); pango_layout_set_text(layout, dive->location ? : " ", -1);
cairo_move_to(cr, 0, 0); cairo_move_to(cr, 0, 0);
pango_cairo_show_layout(cr, layout); pango_cairo_show_layout(cr, layout);
g_object_unref(layout);
pango_layout_get_size(layout, &width, &height); /* If we have translations get back the coordinates to original*/
cairo_translate(cr,0, - ((h * PANGO_SCALE * 0.9) - maxheight) / PANGO_SCALE);
}
/* /*
* Show the dive notes * Show the dive notes
*/ */
if (dive->notes) { static void show_dive_notes(struct dive *dive, cairo_t *cr, double w,
/* Move down by the size of the location (x2) */ double h, PangoFontDescription *font)
height = height * 2; {
cairo_translate(cr, 0, height / (double) PANGO_SCALE); int maxwidth, maxheight;
maxheight -= height; PangoLayout *layout;
/* Use the full width and remaining height for notes */ maxwidth = w * PANGO_SCALE;
maxheight = h * PANGO_SCALE * 0.9;
layout = pango_cairo_create_layout(cr);
if (dive->notes) {
pango_layout_set_height(layout, maxheight); pango_layout_set_height(layout, maxheight);
pango_layout_set_width(layout, maxwidth); pango_layout_set_width(layout, maxwidth);
if (print_options.type == ONEPERPAGE){ if (print_options.type == ONEPERPAGE){
@ -339,8 +346,10 @@ static void print(int divenr, cairo_t *cr, double x, double y, double w,
/* Dive information in the lower third */ /* Dive information in the lower third */
cairo_translate(cr, 0, h*1.33); cairo_translate(cr, 0, h*1.33);
show_dive_header(dive, cr, w*2, h*0.20, font);
show_dive_text(dive, cr, w*2, h*0.67, font); cairo_translate(cr, 0, h*0.20);
show_dive_notes(dive, cr, w*2, h*0.47, font);
cairo_restore(cr); cairo_restore(cr);
} }