X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=a5a0f2d511801402c611c2a55f61218483b6d67c;hb=033732b500a35f3737bad515349d884cb3f123f0;hp=1442151262121406319c9bdf737f5f2f54a34d56;hpb=73afd124ab87e8bace98db55517a56c797a9b8c7;p=libs%2Fgltk.git diff --git a/source/widget.cpp b/source/widget.cpp index 1442151..a5a0f2d 100644 --- a/source/widget.cpp +++ b/source/widget.cpp @@ -30,7 +30,11 @@ Widget::Widget(): Widget::~Widget() { if(parent) - parent->remove(*this); + { + Container *p = parent; + parent = 0; + p->remove(*this); + } } void Widget::set_position(int x, int y) @@ -47,6 +51,19 @@ void Widget::set_size(unsigned w, unsigned h) on_geometry_change(); } +void Widget::autosize() +{ + geom.w = 0; + geom.h = 0; + const Style::PartSeq &parts = style->get_parts(); + for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i) + if(i->get_name().empty()) + { + geom.w = max(geom.w, i->get_geometry().w); + geom.h = max(geom.h, i->get_geometry().h); + } +} + void Widget::set_geometry(const Geometry &g) { geom = g; @@ -57,6 +74,8 @@ void Widget::set_parent(Container *p) { if(parent && p) throw InvalidState("Widget is already in a Container"); + else if(p==parent) + return; parent = p; on_reparent(); @@ -89,6 +108,7 @@ void Widget::update_style() } on_style_change(); + signal_autosize_changed.emit(); } void Widget::set_tooltip(const string &t)