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

diff --git a/source/button.cpp b/source/button.cpp
index f6cf56c..ec99016 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,6 +14,7 @@ namespace GLtk {
 
 Button::Button(const Resources &r, const std::string &t):
 	Widget(r),
+	icon(0),
 	pressed(false)
 {
 	set_text(t);
@@ -24,6 +26,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)
@@ -60,6 +67,28 @@ void Button::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
 		render_text(part, text);
+	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();
+	}
 }