X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbutton.cpp;h=3c71499bde19cdc32794478687ef689e18f4e90b;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=f6cf56c1f07ecbd8b0fa41a7b49e13d269b50156;hpb=3db68f2604b657e79f1b2b317c19c41c2d5a985b;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index f6cf56c..3c71499 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,35 +1,69 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/gl/immediate.h>
 #include "button.h"
 #include "part.h"
 
 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::set_text(const std::string &t)
 {
-	text=t;
+	text = t;
+}
+
+void Button::set_icon(const GL::Texture2D *i)
+{
+	icon = i;
+}
+
+void Button::render_special(const Part &part) const
+{
+	if(part.get_name()=="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();
+	}
 }
 
 void Button::button_press(int, int, unsigned btn)
 {
 	if(btn==1)
 	{
-		pressed=true;
-		state|=ACTIVE;
+		pressed = true;
+		state |= ACTIVE;
 	}
 }
 
@@ -37,11 +71,11 @@ void Button::button_release(int x, int y, unsigned btn)
 {
 	if(pressed && btn==1)
 	{
+		state &= ~ACTIVE;
+		pressed = false;
+
 		if(geom.is_inside_relative(x, y))
 			signal_clicked.emit();
-		
-		state&=~ACTIVE;
-		pressed=false;
 	}
 }
 
@@ -50,28 +84,27 @@ void Button::pointer_motion(int x, int y)
 	if(pressed)
 	{
 		if(!geom.is_inside_relative(x, y))
-			state&=~ACTIVE;
+			state &= ~ACTIVE;
 		else
-			state|=ACTIVE;
+			state |= ACTIVE;
 	}
 }
 
-void Button::render_special(const Part &part) const
+void Button::on_style_change()
 {
-	if(part.get_name()=="text")
-		render_text(part, text);
+	text.set_style(style);
 }
 
 
 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 &>(obj).text = t;
 }
 
 } // namespace GLtk