X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftext.cpp;h=8ef17392f353259c0fa83ec95b1f5b4e6a08a41c;hb=bf4dbeb94ef7ce7fc7f9fb3e5f1d75cfe5cefff2;hp=aa5ad8030efe6be34a08218932e4c0d284d2a98f;hpb=96df5b14a964da5a592a36e10a23022d5649462a;p=libs%2Fgltk.git

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<int>(-font.get_descent()*font_size);
 
 	const Sides &margin = part.get_margin();
-	unsigned n_lines = min<unsigned>(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<unsigned>(lines.size(), max(fit_height/line_spacing, 1U));
 	first_row = min<unsigned>(first_row, lines.size()-n_lines);
 
 	for(unsigned i=0; i<n_lines; ++i)