X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=8ef17392f353259c0fa83ec95b1f5b4e6a08a41c;hb=bf4dbeb94ef7ce7fc7f9fb3e5f1d75cfe5cefff2;hp=af6b17f85e14946b23088909c26cd056dcbe4768;hpb=d5ab14158fee3fa48cb514f19d81b25bf2fe71ab;p=libs%2Fgltk.git

diff --git a/source/text.cpp b/source/text.cpp
index af6b17f..8ef1739 100644
--- 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);
 }
 
@@ -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)