X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=aa5ad8030efe6be34a08218932e4c0d284d2a98f;hb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;hp=4d80ad548004f57276ce202ffa4e82fcbdc04daf;hpb=319cde3c06181ba1c3619567525002926d8b4889;p=libs%2Fgltk.git

diff --git a/source/text.cpp b/source/text.cpp
index 4d80ad5..aa5ad80 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,19 +165,19 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi
 	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;