X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=b881b3f97fd8b52394b2e6bf9be1bd9869621598;hb=768c65e13861f72929290ac2513df9975579e543;hp=243225964caa37752a8ee1979c398577f96482a8;hpb=c1f038acb91eb3bfaa34dfd4729d19ed3f871a42;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index 2432259..b881b3f 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,61 +1,141 @@
+#include <msp/gl/meshbuilder.h>
 #include "button.h"
 #include "part.h"
+#include "style.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
-Button::Button(const Resources &r, const std::string &t):
-	Widget(r)
+Button::Button(const std::string &t):
+	text(),
+	icon(0),
+	pressed(false)
 {
 	set_text(t);
-	update_style();
+}
+
+void Button::autosize()
+{
+	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(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)
 {
-	text=t;
+	text = t;
+	signal_autosize_changed.emit();
+	rebuild();
 }
 
-void Button::render_part(const Part &part) const
+void Button::set_icon(const GL::Texture2D *i)
+{
+	icon = i;
+	rebuild();
+}
+
+void Button::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="text")
+		text.build(part, geom, cache);
+	if(part.get_name()=="icon")
 	{
-		render_text(part, text);
-		/*const GL::Font *const font=style->get_font();
-
-		const float font_size=font->get_default_size();
-		unsigned text_w=static_cast<unsigned>(font->get_string_width(text)*font_size);
-
-		part.get_alignment().apply(geom, text_w, static_cast<unsigned>(font_size));
-
-		GL::push_matrix();
-		GL::scale_uniform(font_size);
+		cache.texture = icon;
+		if(icon)
+		{
+			Geometry rgeom;
+			rgeom.w = icon->get_width();
+			rgeom.h = icon->get_height();
+			part.get_alignment().apply(rgeom, geom, part.get_margin());
 
-		const Color &color=style->get_font_color();
-		glColor3f(color.r, color.g, color.b);
-		font->draw_string(text);
-		glColor3f(1, 1, 1);
+			cache.clear_mesh();
 
-		GL::pop_matrix();*/
+			GL::MeshBuilder bld(*cache.mesh);
+			bld.color(1.0f, 1.0f, 1.0f);
+			bld.begin(GL::QUADS);
+			bld.texcoord(0, 0);
+			bld.vertex(rgeom.x, rgeom.y);
+			bld.texcoord(1, 0);
+			bld.vertex(rgeom.x+rgeom.w, rgeom.y);
+			bld.texcoord(1, 1);
+			bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
+			bld.texcoord(0, 1);
+			bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+			bld.end();
+		}
 	}
-	else
-		Widget::render_part(part);
 }
 
-void Button::on_button_press(int, int, unsigned btn)
+void Button::button_press(int, int, unsigned btn)
 {
 	if(btn==1)
-		state=ACTIVE;
+	{
+		pressed = true;
+		set_state(ACTIVE);
+	}
 }
 
-void Button::on_button_release(int, int, unsigned btn)
+void Button::button_release(int x, int y, unsigned btn)
 {
-	if(btn==1/* && x>=0 && y>=0 && x<static_cast<int>(geom.w) && y<static_cast<int>(geom.h)*/)
+	if(pressed && btn==1)
 	{
-		state=NORMAL;
-		signal_clicked.emit();
+		clear_state(ACTIVE);
+		pressed = false;
+
+		if(geom.is_inside_relative(x, y))
+			signal_clicked.emit();
 	}
 }
 
+void Button::pointer_motion(int x, int y)
+{
+	if(pressed)
+	{
+		if(!geom.is_inside_relative(x, y))
+			clear_state(ACTIVE);
+		else
+			set_state(ACTIVE);
+	}
+}
+
+void Button::on_style_change()
+{
+	text.set_style(style);
+}
+
+
+Button::Loader::Loader(Button &btn):
+	DataFile::DerivedObjectLoader<Button, Widget::Loader>(btn)
+{
+	add("text", &Loader::text);
+}
+
+void Button::Loader::text(const std::string &t)
+{
+	obj.text = t;
+}
+
 } // namespace GLtk
 } // namespace Msp