X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=1d7a7930dc4bc58c695e8d2082fb5895e9598f66;hb=8d09cdc5e642af9a2e1210ce708790c5b41cb585;hp=aa5ad8030efe6be34a08218932e4c0d284d2a98f;hpb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;p=libs%2Fgltk.git diff --git a/source/text.cpp b/source/text.cpp index aa5ad80..1d7a793 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -160,7 +160,7 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi data.row = row; data.col = col; - process_lines(part, parent, first_row, data); + process_lines(part, parent, first_row, &Text::coords_to_geom_line, data); return data.result; } @@ -182,7 +182,7 @@ void Text::build(const Part &part, State state, const Geometry &parent, unsigned RenderData data; data.bld = &bld; - process_lines(part, parent, first_row, data); + process_lines(part, parent, first_row, &Text::build_line, data); } Text &Text::operator=(const string &t) @@ -217,8 +217,8 @@ void Text::find_lines() } } -template -void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const +template +void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, void (Text::*func)(unsigned, const Geometry &, T &) const, T &data) const { if(!style) return; @@ -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