Browse Source

count blank lines too

David Rose 17 years ago
parent
commit
dde2109d07
1 changed files with 3 additions and 5 deletions
  1. 3 5
      panda/src/text/textAssembler.cxx

+ 3 - 5
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());
   }
 }