X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=8fd2de6cb02e2abbb15d4b41035d71b551e88ebf;hb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;hp=939d02646249b8d2aec450299edba5f422ea37dc;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index 939d026..8fd2de6 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -16,31 +16,16 @@ Button::Button(const std::string &t):
 	set_text(t);
 }
 
-void Button::autosize()
+void Button::autosize_special(const Part &part, Geometry &ageom)
 {
-	if(!style)
-		return;
-
-	Widget::autosize();
-
-	if(const Part *text_part = style->get_part("text"))
+	if(part.get_name()=="text")
+		text.autosize(part, ageom);
+	else if(part.get_name()=="icon" && icon)
 	{
-		const Sides &margin = text_part->get_margin();
-		geom.w = max(geom.w, text.get_width()+margin.left+margin.right);
-		geom.h = max(geom.h, text.get_height()+margin.top+margin.bottom);
+		const Sides &margin = part.get_margin();
+		ageom.w = max(ageom.w, icon->get_width()+margin.left+margin.right);
+		ageom.h = max(ageom.h, icon->get_height()+margin.top+margin.bottom);
 	}
-
-	if(icon)
-	{
-		if(const Part *icon_part = style->get_part("icon"))
-		{
-			const Sides &margin = icon_part->get_margin();
-			geom.w = max(geom.w, icon->get_width()+margin.left+margin.right);
-			geom.h = max(geom.h, icon->get_height()+margin.top+margin.bottom);
-		}
-	}
-
-	rebuild();
 }
 
 void Button::set_text(const std::string &t)
@@ -56,13 +41,12 @@ void Button::set_icon(const GL::Texture2D *i)
 	rebuild();
 }
 
-void Button::rebuild_special(const Part &part, CachedPart &cache)
+void Button::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, cache);
+		text.build(part, state, geom, part_cache);
 	if(part.get_name()=="icon")
 	{
-		cache.texture = icon;
 		if(icon)
 		{
 			Geometry rgeom;
@@ -70,9 +54,7 @@ void Button::rebuild_special(const Part &part, CachedPart &cache)
 			rgeom.h = icon->get_height();
 			part.get_alignment().apply(rgeom, geom, part.get_margin());
 
-			cache.clear_mesh();
-
-			GL::MeshBuilder bld(*cache.mesh);
+			GL::MeshBuilder bld(part_cache.create_mesh(part, *icon));
 			bld.color(1.0f, 1.0f, 1.0f);
 			bld.begin(GL::QUADS);
 			bld.texcoord(0, 0);
@@ -127,14 +109,14 @@ void Button::on_style_change()
 
 
 Button::Loader::Loader(Button &btn):
-	Widget::Loader(btn)
+	DataFile::DerivedObjectLoader<Button, Widget::Loader>(btn)
 {
 	add("text", &Loader::text);
 }
 
 void Button::Loader::text(const std::string &t)
 {
-	static_cast<Button &>(obj).text = t;
+	obj.text = t;
 }
 
 } // namespace GLtk