From: Andrea Zagli Date: Tue, 1 Nov 2011 12:48:58 +0000 (+0100) Subject: Bugfix on fill-with implementation: it loops when there's only one word. X-Git-Tag: 0.5.0~12 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=58909cc7c9eb2d8435136bb9f97cae97f8b96bef;p=reptool%2Flibreptool Bugfix on fill-with implementation: it loops when there's only one word. Because it is always one line. refs #172 --- diff --git a/.gitignore b/.gitignore index 1fb312c..237bf03 100644 --- a/.gitignore +++ b/.gitignore @@ -53,8 +53,6 @@ tests/test_rptreport tests/test_rptreport_creation tests/test_rptreport_liststore tests/test_report_created* -tests/test_rptprint_mm.rptr -tests/test_report_newline.rpt POTFILES mkinstalldirs stamp-it diff --git a/src/rptprint.c b/src/rptprint.c index cb926e7..e833555 100644 --- a/src/rptprint.c +++ b/src/rptprint.c @@ -1059,6 +1059,8 @@ rpt_print_text_xml (RptPrint *rpt_print, xmlNode *xnode) if (prop != NULL && g_strcmp0 (g_strstrip (prop), "") != 0) { + PangoLayoutLine *line; + PangoRectangle rect; gint lines; GString *text_tmp; @@ -1069,12 +1071,17 @@ rpt_print_text_xml (RptPrint *rpt_print, xmlNode *xnode) g_string_append (text_tmp, prop); pango_layout_set_text (playout, text_tmp->str, -1); - while (lines == pango_layout_get_line_count (playout)) + line = pango_layout_get_line (playout, pango_layout_get_line_count (playout) - 1); + pango_layout_line_get_pixel_extents (line, NULL, &rect); + while (lines == pango_layout_get_line_count (playout) + && rect.width < layout_width) { g_string_append (text, prop); g_string_append (text_tmp, prop); pango_layout_set_text (playout, text_tmp->str, -1); + line = pango_layout_get_line (playout, pango_layout_get_line_count (playout) - 1); + pango_layout_line_get_pixel_extents (line, NULL, &rect); } g_string_free (text_tmp, TRUE); diff --git a/tests/test_report.rpt b/tests/test_report.rpt index 7458811..10c269d 100644 --- a/tests/test_report.rpt +++ b/tests/test_report.rpt @@ -14,18 +14,18 @@ - - - - + + + + - - + +

- - + +

diff --git a/tests/test_report_db.rpt b/tests/test_report_db.rpt index 05d960b..8852066 100644 --- a/tests/test_report_db.rpt +++ b/tests/test_report_db.rpt @@ -11,29 +11,29 @@

- +

- - + + - - - - - + + + + +

- - - + + +

- - - - + + + +

diff --git a/tests/test_report_newline.rpt b/tests/test_report_newline.rpt new file mode 100644 index 0000000..639bf14 --- /dev/null +++ b/tests/test_report_newline.rpt @@ -0,0 +1,18 @@ + + + + Newline test + A report to test if the newline character (#10) works + + + + + + + + + + + + + diff --git a/tests/test_rptprint_mm.rptr b/tests/test_rptprint_mm.rptr new file mode 100644 index 0000000..cdf540d --- /dev/null +++ b/tests/test_rptprint_mm.rptr @@ -0,0 +1,25 @@ + + + + mm + + + Text sample + + +