X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=86b73c9daa0c3f8ba9a689ebf628f102667c97f7;hb=b3234ca0277c5e282a2a0a2558b58edb25750653;hp=fb052629d626c7eae2ae9f22cc93d4cc94f87311;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index fb05262..86b73c9 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,4 +1,4 @@
-#include <msp/gl/immediate.h>
+#include <msp/gl/meshbuilder.h>
 #include "button.h"
 #include "part.h"
 #include "style.h"
@@ -16,28 +16,15 @@ Button::Button(const std::string &t):
 	set_text(t);
 }
 
-void Button::autosize()
+void Button::autosize_special(const Part &part, Geometry &ageom) const
 {
-	if(!style)
-		return;
-
-	Widget::autosize();
-
-	if(const Part *text_part = style->get_part("text"))
-	{
-		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);
-	}
-
-	if(icon)
+	if(part.get_name()=="text")
+		text.autosize(part, ageom);
+	else if(part.get_name()=="icon" && 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);
-		}
+		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);
 	}
 }
 
@@ -45,38 +32,41 @@ void Button::set_text(const std::string &t)
 {
 	text = t;
 	signal_autosize_changed.emit();
+	rebuild();
 }
 
 void Button::set_icon(const GL::Texture2D *i)
 {
 	icon = i;
+	rebuild();
 }
 
-void Button::render_special(const Part &part) const
+void Button::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.render(part, geom);
-	if(part.get_name()=="icon" && icon)
+		text.build(part, state, geom, part_cache);
+	if(part.get_name()=="icon")
 	{
-		Geometry rgeom;
-		rgeom.w = icon->get_width();
-		rgeom.h = icon->get_height();
-		part.get_alignment().apply(rgeom, geom, part.get_margin());
-
-		icon->bind();
-		GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-		imm.color(1.0f, 1.0f, 1.0f);
-		imm.begin(GL::QUADS);
-		imm.texcoord(0, 0);
-		imm.vertex(rgeom.x, rgeom.y);
-		imm.texcoord(1, 0);
-		imm.vertex(rgeom.x+rgeom.w, rgeom.y);
-		imm.texcoord(1, 1);
-		imm.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
-		imm.texcoord(0, 1);
-		imm.vertex(rgeom.x, rgeom.y+rgeom.h);
-		imm.end();
-		GL::Texture::unbind();
+		if(icon)
+		{
+			Geometry rgeom;
+			rgeom.w = icon->get_width();
+			rgeom.h = icon->get_height();
+			part.get_alignment().apply(rgeom, geom, part.get_margin());
+
+			GL::MeshBuilder bld(part_cache.create_mesh(part, *icon));
+			bld.color(1.0f, 1.0f, 1.0f);
+			bld.begin(GL::TRIANGLE_STRIP);
+			bld.texcoord(0, 1);
+			bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+			bld.texcoord(0, 0);
+			bld.vertex(rgeom.x, rgeom.y);
+			bld.texcoord(1, 1);
+			bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
+			bld.texcoord(1, 0);
+			bld.vertex(rgeom.x+rgeom.w, rgeom.y);
+			bld.end();
+		}
 	}
 }
 
@@ -85,7 +75,7 @@ void Button::button_press(int, int, unsigned btn)
 	if(btn==1)
 	{
 		pressed = true;
-		state |= ACTIVE;
+		set_state(ACTIVE);
 	}
 }
 
@@ -93,7 +83,7 @@ void Button::button_release(int x, int y, unsigned btn)
 {
 	if(pressed && btn==1)
 	{
-		state &= ~ACTIVE;
+		clear_state(ACTIVE);
 		pressed = false;
 
 		if(geom.is_inside_relative(x, y))
@@ -106,9 +96,9 @@ void Button::pointer_motion(int x, int y)
 	if(pressed)
 	{
 		if(!geom.is_inside_relative(x, y))
-			state &= ~ACTIVE;
+			clear_state(ACTIVE);
 		else
-			state |= ACTIVE;
+			set_state(ACTIVE);
 	}
 }
 
@@ -119,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