X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fwidget.cpp;h=8c59c07fe1e9d4b877907499fb6e70c8cee55a4c;hb=3f301f9b6f73e886bdbb61565edb2c02667039d0;hp=48b647b71850b464bf8da56f102170d64bc8cf6e;hpb=aba0416fb73e17d068b30ff163c2fedcb0254da2;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 48b647b..8c59c07 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -58,6 +58,11 @@ void Widget::set_style(const string &s)
 	update_style();
 }
 
+void Widget::set_tooltip(const string &t)
+{
+	tooltip = t;
+}
+
 void Widget::set_visible(bool v)
 {
 	if(v==visible)
@@ -65,8 +70,7 @@ void Widget::set_visible(bool v)
 
 	visible=v;
 
-	if(!visible && parent)
-		parent->child_hidden(*this);
+	signal_visibility_changed.emit(visible);
 }
 
 void Widget::set_focus()
@@ -76,7 +80,7 @@ void Widget::set_focus()
 	if(!visible)
 		throw InvalidState("Can't set focus on invisible widget");
 
-	parent->grab_focus(*this);
+	signal_request_focus.emit();
 }
 
 void Widget::render() const
@@ -89,43 +93,16 @@ void Widget::render() const
 	for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
 	{
 		if(i->get_name().empty())
-			render_graphic(*i);
+		{
+			GL::PushMatrix push_;
+			i->render(geom, state);
+		}
 		else
 			render_special(*i);
 	}
 	GL::pop_matrix();
 }
 
-void Widget::render_graphic(const Part &part) const
-{
-	GL::push_matrix();
-	part.render(geom, state);
-	GL::pop_matrix();
-}
-
-void Widget::render_text(const Part &part, const string &text) const
-{
-	const GL::Font *const font=style->get_font();
-	const float font_size=font->get_default_size();
-
-	Geometry rgeom;
-	rgeom.w=static_cast<unsigned>(font->get_string_width(text)*font_size);
-	rgeom.h=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
-	rgeom.y=static_cast<int>(-font->get_descent()*font_size);
-	part.get_alignment().apply(rgeom, geom, part.get_margin());
-
-	GL::push_matrix();
-	GL::translate(rgeom.x, rgeom.y, 0);
-	GL::scale_uniform(font_size);
-
-	const GL::Color &color=style->get_font_color();
-	GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-	imm.color(color.r, color.g, color.b);
-	font->draw_string(text, imm);
-
-	GL::pop_matrix();
-}
-
 void Widget::pointer_enter()
 {
 	state|=HOVER;
@@ -158,16 +135,16 @@ void Widget::update_style()
 	on_style_change();
 }
 
-void Widget::set_parent(Panel *p)
+void Widget::set_parent(Container *p)
 {
 	if(parent && p)
-		throw InvalidState("Widget is already in a Panel");
+		throw InvalidState("Widget is already in a Container");
 	parent=p;
 
 	on_reparent();
 }
 
-void Widget::set_parent(Widget &w, Panel *p)
+void Widget::set_parent(Widget &w, Container *p)
 {
 	w.set_parent(p);
 }