Store autosized geom in Layout::Slot

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

diff --git a/source/container.cpp b/source/container.cpp
index a46492d4ea3a1b7bb5e464952d7db846db4633c8..bec206602a95248c72f53ad4de28f41444b71659 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "container.h"
 
 using namespace std;
@@ -12,8 +5,12 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Container::Container(const Resources &r):
-       Widget(r),
+hierarchy_error::hierarchy_error(const string &w):
+       logic_error(w)
+{ }
+
+
+Container::Container():
        click_focus(0),
        click_button(0)
 { }
@@ -26,8 +23,9 @@ Container::~Container()
 
 void Container::add(Widget &wdg)
 {
-       set_parent(wdg, this);
+       wdg.set_parent(this);
        children.push_back(create_child(&wdg));
+       on_child_added(wdg);
 }
 
 void Container::remove(Widget &wdg)
@@ -35,13 +33,19 @@ void Container::remove(Widget &wdg)
        for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
                if((*i)->widget==&wdg)
                {
-                       set_parent(wdg, 0);
+                       wdg.set_parent(0);
                        delete *i;
                        children.erase(i);
+                       on_child_removed(wdg);
                        return;
                }
 
-       throw InvalidState("That Widget is not in this Container");
+       throw hierarchy_error("widget not in container");
+}
+
+Container::Child *Container::create_child(Widget *wdg)
+{
+       return new Child(*this, wdg);
 }
 
 list<Widget *> Container::get_children() const
@@ -63,11 +67,11 @@ Widget *Container::get_child_at(int x, int y)
 
 Widget *Container::get_descendant_at(int x, int y)
 {
-       Widget *wdg=get_child_at(x, y);
-       if(Container *cont=dynamic_cast<Container *>(wdg))
+       Widget *wdg = get_child_at(x, y);
+       if(Container *cont = dynamic_cast<Container *>(wdg))
        {
-               const Geometry &cgeom=wdg->get_geometry();
-               Widget *wdg2=cont->get_descendant_at(x-cgeom.x, y-cgeom.y);
+               const Geometry &cgeom = wdg->get_geometry();
+               Widget *wdg2 = cont->get_descendant_at(x-cgeom.x, y-cgeom.y);
                if(wdg2)
                        return wdg2;
        }
@@ -78,17 +82,17 @@ void Container::button_press(int x, int y, unsigned btn)
 {
        if(click_focus)
        {
-               const Geometry &cgeom=click_focus->get_geometry();
+               const Geometry &cgeom = click_focus->get_geometry();
                click_focus->button_press(x-cgeom.x, y-cgeom.y, btn);
        }
        else
        {
-               if(Widget *wdg=get_child_at(x, y))
+               if(Widget *wdg = get_child_at(x, y))
                {
-                       click_focus=wdg;
-                       click_button=btn;
+                       click_focus = wdg;
+                       click_button = btn;
 
-                       const Geometry &cgeom=wdg->get_geometry();
+                       const Geometry &cgeom = wdg->get_geometry();
                        wdg->button_press(x-cgeom.x, y-cgeom.y, btn);
                }
        }
@@ -98,19 +102,19 @@ void Container::button_release(int x, int y, unsigned btn)
 {
        if(click_focus)
        {
-               Widget *wdg=click_focus;
+               Widget *wdg = click_focus;
 
                if(btn==click_button)
-                       click_focus=0;
+                       click_focus = 0;
 
-               const Geometry &cgeom=wdg->get_geometry();
+               const Geometry &cgeom = wdg->get_geometry();
                wdg->button_release(x-cgeom.x, y-cgeom.y, btn);
        }
        else
        {
-               if(Widget *wdg=get_child_at(x, y))
+               if(Widget *wdg = get_child_at(x, y))
                {
-                       const Geometry &cgeom=wdg->get_geometry();
+                       const Geometry &cgeom = wdg->get_geometry();
                        wdg->button_release(x-cgeom.x, y-cgeom.y, btn);
                }
        }
@@ -120,15 +124,15 @@ void Container::pointer_motion(int x, int y)
 {
        if(click_focus)
        {
-               const Geometry &cgeom=click_focus->get_geometry();
+               const Geometry &cgeom = click_focus->get_geometry();
                click_focus->pointer_motion(x-cgeom.x, y-cgeom.y);
        }
        else
        {
-               Widget *wdg=get_child_at(x, y);
+               Widget *wdg = get_child_at(x, y);
                if(wdg)
                {
-                       const Geometry &cgeom=wdg->get_geometry();
+                       const Geometry &cgeom = wdg->get_geometry();
                        wdg->pointer_motion(x-cgeom.x, y-cgeom.y);
                }
        }
@@ -137,12 +141,17 @@ void Container::pointer_motion(int x, int y)
 void Container::pointer_leave()
 {
        Widget::pointer_leave();
-       click_focus=0;
+       click_focus = 0;
 }
 
-Container::Child *Container::create_child(Widget *wdg)
+void Container::on_reparent()
 {
-       return new Child(*this, wdg);
+       for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+       {
+               if(Container *c = dynamic_cast<Container *>((*i)->widget))
+                       c->on_reparent();
+               (*i)->widget->update_style();
+       }
 }
 
 
@@ -156,13 +165,13 @@ Container::Child::Child(Container &c, Widget *w):
 Container::Child::~Child()
 {
        if(widget==container.click_focus)
-               container.click_focus=0;
+               container.click_focus = 0;
 }
 
 void Container::Child::visibility_changed(bool v)
 {
        if(!v && widget==container.click_focus)
-               container.click_focus=0;
+               container.click_focus = 0;
 }
 
 } // namespace GLtk