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

diff --git a/source/button.cpp b/source/button.cpp
index 2432259..f6cf56c 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include "button.h"
 #include "part.h"
 
@@ -5,7 +12,8 @@ namespace Msp {
 namespace GLtk {
 
 Button::Button(const Resources &r, const std::string &t):
-	Widget(r)
+	Widget(r),
+	pressed(false)
 {
 	set_text(t);
 	update_style();
@@ -16,46 +24,55 @@ void Button::set_text(const std::string &t)
 	text=t;
 }
 
-void Button::render_part(const Part &part) const
+void Button::button_press(int, int, unsigned btn)
 {
-	if(part.get_name()=="text")
+	if(btn==1)
 	{
-		render_text(part, text);
-		/*const GL::Font *const font=style->get_font();
-
-		const float font_size=font->get_default_size();
-		unsigned text_w=static_cast<unsigned>(font->get_string_width(text)*font_size);
-
-		part.get_alignment().apply(geom, text_w, static_cast<unsigned>(font_size));
-
-		GL::push_matrix();
-		GL::scale_uniform(font_size);
-
-		const Color &color=style->get_font_color();
-		glColor3f(color.r, color.g, color.b);
-		font->draw_string(text);
-		glColor3f(1, 1, 1);
-
-		GL::pop_matrix();*/
+		pressed=true;
+		state|=ACTIVE;
 	}
-	else
-		Widget::render_part(part);
 }
 
-void Button::on_button_press(int, int, unsigned btn)
+void Button::button_release(int x, int y, unsigned btn)
 {
-	if(btn==1)
-		state=ACTIVE;
+	if(pressed && btn==1)
+	{
+		if(geom.is_inside_relative(x, y))
+			signal_clicked.emit();
+		
+		state&=~ACTIVE;
+		pressed=false;
+	}
 }
 
-void Button::on_button_release(int, int, unsigned btn)
+void Button::pointer_motion(int x, int y)
 {
-	if(btn==1/* && x>=0 && y>=0 && x<static_cast<int>(geom.w) && y<static_cast<int>(geom.h)*/)
+	if(pressed)
 	{
-		state=NORMAL;
-		signal_clicked.emit();
+		if(!geom.is_inside_relative(x, y))
+			state&=~ACTIVE;
+		else
+			state|=ACTIVE;
 	}
 }
 
+void Button::render_special(const Part &part) const
+{
+	if(part.get_name()=="text")
+		render_text(part, text);
+}
+
+
+Button::Loader::Loader(Button &btn):
+	Widget::Loader(btn)
+{
+	add("text", &Button::text);
+}
+
+Button &Button::Loader::get_object() const
+{
+	return static_cast<Button &>(wdg);
+}
+
 } // namespace GLtk
 } // namespace Msp