Make func a normal argument of Text::process_lines

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

diff --git a/source/text.cpp b/source/text.cpp
index a0f53c238c12b88eca6df4f5b28135839163d804..1d7a7930dc4bc58c695e8d2082fb5895e9598f66 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -160,29 +160,29 @@ 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;
 }
 
-void Text::build(const Part &part, const Geometry &parent, PartCache &cache) const
+void Text::build(const Part &part, State state, const Geometry &parent, PartCache &cache) const
 {
-       build(part, parent, 0, cache);
+       build(part, state, parent, 0, cache);
 }
 
-void Text::build(const Part &part, const Geometry &parent, unsigned first_row, PartCache &cache) const
+void Text::build(const Part &part, State state, const Geometry &parent, unsigned first_row, PartCache &cache) const
 {
        if(!style || lines.empty())
                return;
 
        const GL::Font &font = style->get_font();
        GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture()));
-       bld.color(style->get_font_color());
+       bld.color(style->get_font_color(state));
 
        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,8 +217,8 @@ 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;
@@ -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)