Improve widget part caching

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

diff --git a/source/text.cpp b/source/text.cpp
index 08846a4c75acd587fa47bce8dd1b835cbd42e153..4d80ad548004f57276ce202ffa4e82fcbdc04daf 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -158,30 +158,23 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi
        return data.result;
 }
 
-void Text::build(const Part &part, const Geometry &parent, CachedPart &cache) const
+void Text::build(const Part &part, const Geometry &parent, PartCache &cache) const
 {
        build(part, parent, 0, cache);
 }
 
-void Text::build(const Part &part, const Geometry &parent, unsigned first_row, CachedPart &cache) const
+void Text::build(const Part &part, const Geometry &parent, unsigned first_row, PartCache &cache) const
 {
        if(!style || lines.empty())
-       {
-               cache.texture = 0;
                return;
-       }
-
-       cache.clear_mesh();
-       GL::MeshBuilder bld(*cache.mesh);
 
        const GL::Font &font = style->get_font();
+       GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture()));
        bld.color(style->get_font_color());
 
        RenderData data;
        data.bld = &bld;
 
-       cache.texture = &font.get_texture();
-
        process_lines<RenderData, &Text::build_line>(part, parent, first_row, data);
 }
 
@@ -231,8 +224,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(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
-       first_row = min(first_row, lines.size()-n_lines);
+       unsigned n_lines = min<unsigned>(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
+       first_row = min<unsigned>(first_row, lines.size()-n_lines);
 
        for(unsigned i=0; i<n_lines; ++i)
        {