Avoid autosizing widgets with no style

[libs/gltk.git] / source / widget.cpp

diff --git a/source/widget.cpp b/source/widget.cpp
index 4e0c4890aa55eaeebe78a9fd0cc393acd6c05723..3d3b0068ad6f394b905d8e6854dafdfeebf9769e 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,14 +1,5 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "container.h"
 #include "resources.h"
 #include "root.h"
@@ -30,33 +21,38 @@ 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)
 {
-       geom.x = x;
-       geom.y = y;
-       on_geometry_change();
+       set_geometry(Geometry(x, y, geom.w, geom.h));
 }
 
 void Widget::set_size(unsigned w, unsigned h)
 {
-       geom.w = w;
-       geom.h = h;
-       on_geometry_change();
+       set_geometry(Geometry(geom.x, geom.y, w, h));
 }
 
 void Widget::autosize()
 {
+       if(!style)
+               return;
+
        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);
+                       const Geometry &pgeom = i->get_geometry();
+                       const Sides &pmargin = i->get_margin();
+                       geom.w = max(geom.w, pgeom.w+pmargin.left+pmargin.right);
+                       geom.h = max(geom.h, pgeom.h+pmargin.top+pmargin.bottom);
                }
 }
 
@@ -64,16 +60,29 @@ void Widget::set_geometry(const Geometry &g)
 {
        geom = g;
        on_geometry_change();
+       rebuild();
 }
 
 void Widget::set_parent(Container *p)
 {
        if(parent && p)
-               throw InvalidState("Widget is already in a Container");
-       parent = p;
+               throw hierarchy_error("widget already parented");
+       else if(p==parent)
+               return;
 
-       on_reparent();
-       update_style();
+       try
+       {
+               parent = p;
+
+               on_reparent();
+               update_style();
+       }
+       catch(...)
+       {
+               // The container has not yet added the widget as its child
+               parent = 0;
+               throw;
+       }
 }
 
 void Widget::set_style(const string &s)
@@ -98,10 +107,12 @@ void Widget::update_style()
                        sname += style_name;
                }
 
-               style = root->get_resources().get<Style>(sname);
+               style = &root->get_resources().get<Style>(sname);
        }
 
        on_style_change();
+       signal_autosize_changed.emit();
+       rebuild();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -127,52 +138,76 @@ void Widget::set_focusable(bool f)
 void Widget::set_focus()
 {
        if(!parent)
-               throw InvalidState("No parent");
+               throw hierarchy_error("no parent");
        if(!visible)
-               throw InvalidState("Can't set focus on invisible widget");
+               throw logic_error("!visible");
 
        signal_request_focus.emit();
 }
 
-void Widget::render() const
+void Widget::set_state(State mask, State bits)
+{
+       state = (state&~mask)|bits;
+       rebuild();
+}
+
+void Widget::rebuild()
 {
        if(!style)
-               throw InvalidState(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
+               return;
 
-       GL::push_matrix();
-       GL::translate(geom.x, geom.y, 0);
        const Style::PartSeq &parts = style->get_parts();
-       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       list<CachedPart>::iterator j = cached_parts.begin();
+       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i, ++j)
        {
+               if(j==cached_parts.end())
+                       j = cached_parts.insert(j, CachedPart());
                if(i->get_name().empty())
+                       i->build(geom, state, *j);
+               else
+                       rebuild_special(*i, *j);
+       }
+}
+
+void Widget::render(GL::Renderer &renderer) const
+{
+       if(!style)
+               throw logic_error(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
+
+       GL::MatrixStack::Push _pushm(renderer.matrix_stack());
+       renderer.matrix_stack() *= GL::Matrix::translation(geom.x, geom.y, 0);
+       const Style::PartSeq &parts = style->get_parts();
+       list<CachedPart>::const_iterator j = cached_parts.begin();
+       for(Style::PartSeq::const_iterator i=parts.begin(); (i!=parts.end() && j!=cached_parts.end()); ++i, ++j)
+       {
+               if(j->mesh && j->texture)
                {
-                       GL::PushMatrix push_;
-                       i->render(geom, state);
+                       renderer.set_texture(j->texture);
+                       j->mesh->draw(renderer);
                }
-               else
-                       render_special(*i);
+               else if(!i->get_name().empty())
+                       render_special(*i, renderer);
        }
-       GL::pop_matrix();
 }
 
 void Widget::pointer_enter()
 {
-       state |= HOVER;
+       set_state(HOVER);
 }
 
 void Widget::pointer_leave()
 {
-       state &= ~HOVER;
+       clear_state(HOVER);
 }
 
 void Widget::focus_in()
 {
-       state |= FOCUS;
+       set_state(FOCUS);
 }
 
 void Widget::focus_out()
 {
-       state &= ~FOCUS;
+       clear_state(FOCUS);
 }