Refactor visible height calculation in Entry and Text

[libs/gltk.git] / source / text.cpp

diff --git a/source/text.cpp b/source/text.cpp
index aa5ad8030efe6be34a08218932e4c0d284d2a98f..1d824e0ddb9ca590f551748921503e626bcdd931 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -115,6 +115,22 @@ void Text::insert(unsigned pos, const string &s)
        }
 }
 
+unsigned Text::get_visible_lines(const Part &part, const Geometry &parent, unsigned *fit_height) const
+{
+       const GL::Font &font = style->get_font();
+       float font_size = style->get_font_size();
+       unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
+       unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
+
+       const Sides &margin = part.get_margin();
+       unsigned vmargin = margin.top+margin.bottom+line_height-line_spacing;
+       unsigned n_lines = min<unsigned>(lines.size(), max((max(parent.h, vmargin)-vmargin)/line_spacing, 1U));
+       if(fit_height)
+               *fit_height = line_height+(n_lines-1)*line_spacing;
+
+       return n_lines;
+}
+
 unsigned Text::get_line_length(unsigned i) const
 {
        if(i>=lines.size())
@@ -160,7 +176,7 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi
        data.row = row;
        data.col = col;
 
-       process_lines<CoordsToGeomData, &Text::coords_to_geom_line>(part, parent, first_row, data);
+       process_lines(part, parent, first_row, &Text::coords_to_geom_line, data);
 
        return data.result;
 }
@@ -182,7 +198,7 @@ void Text::build(const Part &part, State state, const Geometry &parent, unsigned
        RenderData data;
        data.bld = &bld;
 
-       process_lines<RenderData, &Text::build_line>(part, parent, first_row, data);
+       process_lines(part, parent, first_row, &Text::build_line, data);
 }
 
 Text &Text::operator=(const string &t)
@@ -217,21 +233,19 @@ void Text::find_lines()
        }
 }
 
-template<typename T, void (Text::*func)(unsigned, const Geometry &, T &) const>
-void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const
+template<typename T>
+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;
 
        const GL::Font &font = style->get_font();
        float font_size = style->get_font_size();
-       unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
        unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
-       unsigned height = line_height+(lines.size()-1)*line_spacing;
        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;
+       unsigned n_lines = get_visible_lines(part, parent, &fit_height);
        first_row = min<unsigned>(first_row, lines.size()-n_lines);
 
        for(unsigned i=0; i<n_lines; ++i)
@@ -240,7 +254,7 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 
                Geometry rgeom;
                rgeom.w = line.width;
-               rgeom.h = height;
+               rgeom.h = fit_height;
                rgeom.y = (n_lines-1-i)*line_spacing+y_offset;
                part.get_alignment().apply(rgeom, parent, part.get_margin());