X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=2eade3913f4d9c9e4530675657873ee080a2d265;hb=6be5b834084fb3ab421b94b6c4ad8eece6bab754;hp=8674a138ab7b6cf240ff7510524c346e3265a77a;hpb=be8ea35fe6eabe4c68d2d337634f21c63c964265;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 8674a13..2eade39 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,14 +1,35 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
+#include "panel.h"
 #include "resources.h"
 #include "widget.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
+Widget::Widget(const Resources &r):
+	res(r),
+	style(0),
+	state(NORMAL),
+	visible(true),
+	parent(0)
+{ }
+
+Widget::~Widget()
+{
+	if(parent)
+		parent->remove(*this);
+}
+
 void Widget::set_position(int x, int y)
 {
 	geom.x=x;
@@ -32,6 +53,17 @@ void Widget::set_style(const string &s)
 	update_style();
 }
 
+void Widget::set_visible(bool v)
+{
+	if(v==visible)
+		return;
+
+	visible=v;
+
+	if(!visible && parent)
+		parent->child_hidden(*this);
+}
+
 void Widget::render() const
 {
 	if(!style)
@@ -40,30 +72,13 @@ void Widget::render() const
 	GL::push_matrix();
 	GL::translate(geom.x, geom.y, 0);
 	for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
-		render_part(*i);
-	GL::pop_matrix();
-}
-
-Widget::Widget(const Resources &r):
-	res(r),
-	style(0),
-	state(NORMAL)
-{ }
-
-void Widget::update_style()
-{
-	string sname=get_class();
-	if(!style_name.empty())
 	{
-		sname+='-';
-		sname+=style_name;
+		if(i->get_name().empty())
+			render_graphic(*i);
+		else
+			render_special(*i);
 	}
-	style=res.get<Style>(sname);
-}
-
-void Widget::render_part(const Part &part) const
-{
-	render_graphic(part);
+	GL::pop_matrix();
 }
 
 void Widget::render_graphic(const Part &part) const
@@ -76,13 +91,15 @@ void Widget::render_graphic(const Part &part) const
 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();
-	unsigned text_w=static_cast<unsigned>(font->get_string_width(text)*font_size);
 
-	GL::push_matrix();
+	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);
+	part.get_alignment().apply(rgeom, geom, part.get_margin());
 
-	part.get_alignment().apply(geom, text_w, static_cast<unsigned>(font->get_ascent()*font_size));
+	GL::push_matrix();
+	GL::translate(rgeom.x, rgeom.y-font->get_descent()*font_size, 0);
 	GL::scale_uniform(font_size);
 
 	const GL::Color &color=style->get_font_color();
@@ -93,6 +110,29 @@ void Widget::render_text(const Part &part, const string &text) const
 	GL::pop_matrix();
 }
 
+void Widget::update_style()
+{
+	string sname=get_class();
+	if(!style_name.empty())
+	{
+		sname+='-';
+		sname+=style_name;
+	}
+	style=res.get<Style>(sname);
+}
+
+void Widget::set_parent(Panel *p)
+{
+	if(parent && p)
+		throw InvalidState("Widget is already in a Panel");
+	parent=p;
+}
+
+void Widget::set_parent(Widget &w, Panel *p)
+{
+	w.set_parent(p);
+}
+
 
 Widget::Loader::Loader(Widget &w):
 	wdg(w)
@@ -100,6 +140,7 @@ Widget::Loader::Loader(Widget &w):
 	add("position", &Loader::position);
 	add("size",     &Loader::size);
 	add("style",    &Loader::style);
+	add("visible",  &Widget::visible);
 }
 
 void Widget::Loader::position(int x, int y)