X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbutton.cpp;h=fb052629d626c7eae2ae9f22cc93d4cc94f87311;hb=c8f5fd14a1fbdaaa9e1216dd5163d1f5c1b5ff27;hp=e81fe02c20a5ffdc609aa74106adf4b4bc879855;hpb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index e81fe02..fb05262 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,13 +1,9 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  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 {
@@ -20,9 +16,35 @@ Button::Button(const std::string &t):
 	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)
@@ -104,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