From dde2109d075c4cb37417906c939c588d8b38647b Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 30 Oct 2008 00:20:29 +0000 Subject: [PATCH] count blank lines too --- panda/src/text/textAssembler.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/panda/src/text/textAssembler.cxx b/panda/src/text/textAssembler.cxx index 2f547dacd0..0026f4d3d9 100644 --- a/panda/src/text/textAssembler.cxx +++ b/panda/src/text/textAssembler.cxx @@ -1407,16 +1407,14 @@ assemble_row(TextAssembler::TextRow &row, if (row._eol_cprops != (ComputedProperties *)NULL) { // If there's an _eol_cprops, it represents the cprops of the - // newline character that ended the line, which should define the - // line_height and the alignment. + // newline character that ended the line, which should also + // contribute towards the line_height. const TextProperties *properties = &(row._eol_cprops->_properties); TextFont *font = properties->get_font(); nassertv(font != (TextFont *)NULL); - //[fabius] not here but above -/* align = properties->get_align(); - line_height = max(line_height, font->get_line_height());*/ + line_height = max(line_height, font->get_line_height()); } }