X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=fb052629d626c7eae2ae9f22cc93d4cc94f87311;hb=c8f5fd14a1fbdaaa9e1216dd5163d1f5c1b5ff27;hp=5871a5fabd0c7db23b2a0dfea1a5c6e6902f0368;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index 5871a5f..fb05262 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,30 +1,50 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/immediate.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)
 {
-	update_style();
 	set_text(t);
 }
 
+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);
+		}
+	}
+}
+
 void Button::set_text(const std::string &t)
 {
 	text = t;
+	signal_autosize_changed.emit();
 }
 
 void Button::set_icon(const GL::Texture2D *i)
@@ -32,6 +52,34 @@ 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)
@@ -64,34 +112,6 @@ void Button::pointer_motion(int x, int y)
 	}
 }
 
-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::on_style_change()
 {
 	text.set_style(style);
@@ -106,7 +126,7 @@ Button::Loader::Loader(Button &btn):
 
 void Button::Loader::text(const std::string &t)
 {
-	static_cast<Button &>(wdg).text = t;
+	static_cast<Button &>(obj).text = t;
 }
 
 } // namespace GLtk