X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fwidget.cpp;h=1442151262121406319c9bdf737f5f2f54a34d56;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=e41310a50c5fd5cba82298dd3149983b16a0f8a1;hpb=2f1c7d6861c801e24a003ee5f6132032e04c9bbe;p=libs%2Fgltk.git diff --git a/source/widget.cpp b/source/widget.cpp index e41310a..1442151 100644 --- a/source/widget.cpp +++ b/source/widget.cpp @@ -1,14 +1,17 @@ /* $Id$ This file is part of libmspgltk -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007-2011 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ +#include #include #include -#include "panel.h" +#include +#include "container.h" #include "resources.h" +#include "root.h" #include "widget.h" using namespace std; @@ -16,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) { } @@ -32,97 +35,136 @@ 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_style(const string &s) +void Widget::set_parent(Container *p) { - style_name=s; + if(parent && p) + throw InvalidState("Widget is already in a Container"); + parent = p; + + on_reparent(); update_style(); } -void Widget::render() const +void Widget::set_style(const string &s) { - if(!style) - throw InvalidState("Attempt to render a widget without a style"); - - 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(); + style_name = s; + update_style(); } -void Widget::render_part(const Part &part) const +void Widget::update_style() { - render_graphic(part); + Widget *top; + for(top=this; top->parent; top=top->parent) ; + Root *root = dynamic_cast(top); + if(!root) + style = 0; + else + { + string sname = get_class(); + if(!style_name.empty()) + { + sname += '-'; + sname += style_name; + } + + style = root->get_resources().get