Support different font colors in different states

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

diff --git a/source/text.cpp b/source/text.cpp
index af6b17f85e14946b23088909c26cd056dcbe4768..aa5ad8030efe6be34a08218932e4c0d284d2a98f 100644 (file)
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -66,6 +66,13 @@ unsigned Text::get_height() const
        return line_height+(lines.size()-1)*line_spacing;
 }
 
+void Text::autosize(const Part &part, Geometry &geom) const
+{
+       const Sides &margin = part.get_margin();
+       geom.w = max(geom.w, get_width()+margin.left+margin.right);
+       geom.h = max(geom.h, get_height()+margin.top+margin.bottom);
+}
+
 void Text::set(const string &t)
 {
        text = t;
@@ -158,30 +165,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, 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, CachedPart &cache) const
+void Text::build(const Part &part, State state, 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();
-       bld.color(style->get_font_color());
+       GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture()));
+       bld.color(style->get_font_color(state));
 
        RenderData data;
        data.bld = &bld;
 
-       cache.texture = &font.get_texture();
-
        process_lines<RenderData, &Text::build_line>(part, parent, first_row, data);
 }