X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=9cd9066bc82663150daa9ad8fddc65b629650c02;hb=2bdaf4955fdb94e73704adcdcf0adc2b353f0ff0;hp=84d042573ec18aff63230eca34cada3e150dbab3;hpb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 84d0425..9cd9066 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,8 +9,9 @@ Distributed under the LGPL
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
 #include <msp/strings/formatter.h>
-#include "panel.h"
+#include "container.h"
 #include "resources.h"
+#include "root.h"
 #include "widget.h"
 
 using namespace std;
@@ -18,11 +19,11 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Widget::Widget(const Resources &r):
-	res(r),
+Widget::Widget():
 	style(0),
 	state(NORMAL),
 	visible(true),
+	focusable(true),
 	parent(0)
 { }
 
@@ -34,40 +35,82 @@ Widget::~Widget()
 
 void Widget::set_position(int x, int y)
 {
-	geom.x=x;
-	geom.y=y;
+	geom.x = x;
+	geom.y = y;
 	on_geometry_change();
 }
 
 void Widget::set_size(unsigned w, unsigned h)
 {
-	geom.w=w;
-	geom.h=h;
+	geom.w = w;
+	geom.h = h;
 	on_geometry_change();
 }
 
 void Widget::set_geometry(const Geometry &g)
 {
-	geom=g;
+	geom = g;
 	on_geometry_change();
 }
 
+void Widget::set_parent(Container *p)
+{
+	if(parent && p)
+		throw InvalidState("Widget is already in a Container");
+	parent = p;
+
+	on_reparent();
+	update_style();
+}
+
 void Widget::set_style(const string &s)
 {
-	style_name=s;
+	style_name = s;
 	update_style();
 }
 
+void Widget::update_style()
+{
+	Widget *top;
+	for(top=this; top->parent; top=top->parent) ;
+	Root *root = dynamic_cast<Root *>(top);
+	if(!root)
+		style = 0;
+	else
+	{
+		string sname = get_class();
+		if(!style_name.empty())
+		{
+			sname += '-';
+			sname += style_name;
+		}
+
+		style = root->get_resources().get<Style>(sname);
+	}
+
+	on_style_change();
+}
+
+void Widget::set_tooltip(const string &t)
+{
+	tooltip = t;
+}
+
 void Widget::set_visible(bool v)
 {
 	if(v==visible)
 		return;
 
-	visible=v;
+	visible = v;
 
 	signal_visibility_changed.emit(visible);
 }
 
+void Widget::set_focusable(bool f)
+{
+	focusable = f;
+}
+
 void Widget::set_focus()
 {
 	if(!parent)
@@ -81,94 +124,41 @@ void Widget::set_focus()
 void Widget::render() const
 {
 	if(!style)
-		throw InvalidState(format("Attempt to render a widget without a style (class=\"%s\")", get_class()));
+		throw InvalidState(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
 
 	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)
 	{
 		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;
+	state |= HOVER;
 }
 
 void Widget::pointer_leave()
 {
-	state&=~HOVER;
+	state &= ~HOVER;
 }
 
 void Widget::focus_in()
 {
-	state|=FOCUS;
+	state |= FOCUS;
 }
 
 void Widget::focus_out()
 {
-	state&=~FOCUS;
-}
-
-void Widget::update_style()
-{
-	string sname=get_class();
-	if(!style_name.empty())
-	{
-		sname+='-';
-		sname+=style_name;
-	}
-	style=res.get<Style>(sname);
-	on_style_change();
-}
-
-void Widget::set_parent(Container *p)
-{
-	if(parent && p)
-		throw InvalidState("Widget is already in a Container");
-	parent=p;
-
-	on_reparent();
-}
-
-void Widget::set_parent(Widget &w, Container *p)
-{
-	w.set_parent(p);
+	state &= ~FOCUS;
 }