RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

count blank lines too

This commit is contained in:
David Rose 2008-10-30 00:20:29 +00:00
parent 2e362128da
commit dde2109d07
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/text/textAssembler.cxx
View File

@ -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());
}
}