X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=91cc88c403365bfabde2a9f943627bd0814c0325;hb=75a16eae9eb2714f8112d46fa5b8f7908b6d2487;hp=f6cf56c1f07ecbd8b0fa41a7b49e13d269b50156;hpb=3db68f2604b657e79f1b2b317c19c41c2d5a985b;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index f6cf56c..91cc88c 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,10 +1,11 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/gl/immediate.h>
 #include "button.h"
 #include "part.h"
 
@@ -13,10 +14,12 @@ namespace GLtk {
 
 Button::Button(const Resources &r, const std::string &t):
 	Widget(r),
+	text(style),
+	icon(0),
 	pressed(false)
 {
-	set_text(t);
 	update_style();
+	set_text(t);
 }
 
 void Button::set_text(const std::string &t)
@@ -24,6 +27,11 @@ void Button::set_text(const std::string &t)
 	text=t;
 }
 
+void Button::set_icon(const GL::Texture2D *i)
+{
+	icon=i;
+}
+
 void Button::button_press(int, int, unsigned btn)
 {
 	if(btn==1)
@@ -37,11 +45,11 @@ void Button::button_release(int x, int y, unsigned btn)
 {
 	if(pressed && btn==1)
 	{
-		if(geom.is_inside_relative(x, y))
-			signal_clicked.emit();
-		
 		state&=~ACTIVE;
 		pressed=false;
+
+		if(geom.is_inside_relative(x, y))
+			signal_clicked.emit();
 	}
 }
 
@@ -59,19 +67,41 @@ void Button::pointer_motion(int x, int y)
 void Button::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		text.render(part, geom);
+	if(part.get_name()=="icon" && 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();
+	}
 }
 
 
 Button::Loader::Loader(Button &btn):
 	Widget::Loader(btn)
 {
-	add("text", &Button::text);
+	add("text", &Loader::text);
 }
 
-Button &Button::Loader::get_object() const
+void Button::Loader::text(const std::string &t)
 {
-	return static_cast<Button &>(wdg);
+	static_cast<Button &>(wdg).text=t;
 }
 
 } // namespace GLtk