From: Mikko Rasa Date: Wed, 22 Jan 2014 19:51:14 +0000 (+0200) Subject: Fix line processing in Text to match autosizing X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=bf4dbeb94ef7ce7fc7f9fb3e5f1d75cfe5cefff2;p=libs%2Fgltk.git Fix line processing in Text to match autosizing --- diff --git a/source/text.cpp b/source/text.cpp index aa5ad80..8ef1739 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -231,7 +231,8 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs int y_offset = static_cast(-font.get_descent()*font_size); const Sides &margin = part.get_margin(); - unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U)); + unsigned fit_height = parent.h-margin.top-margin.bottom+line_spacing-line_height; + unsigned n_lines = min(lines.size(), max(fit_height/line_spacing, 1U)); first_row = min(first_row, lines.size()-n_lines); for(unsigned i=0; i