Rework how widget ownership works in Container

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

diff --git a/source/part.cpp b/source/part.cpp
index 7c98545c87a49ea5442b88a4463bfaf1c18c620b..aacc52adc28048372c6353dfe8b9a78c2acb72d5 100644 (file)
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -11,9 +11,7 @@ namespace GLtk {
 
 Part::Part(const string &n):
        name(n)
-{
-       fill(graphic, graphic+N_STATES_, static_cast<Graphic *>(0));
-}
+{ }
 
 const Graphic *Part::get_graphic(State state) const
 {
@@ -31,7 +29,7 @@ void Part::build(const Geometry &parent, State state, PartCache &cache) const
        Geometry rgeom = geom;
        align.apply(rgeom, parent, margin);
        GL::MeshBuilder bld(cache.create_mesh(*this, *graphic[state]->get_texture()));
-       bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+       bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
        graphic[state]->build(rgeom.w, rgeom.h, bld);
 }
 
@@ -46,7 +44,7 @@ Part::Loader::Loader(Part &p, Resources &r):
        add("size",    &Loader::size);
 }
 
-Part::Loader::~Loader()
+void Part::Loader::finish()
 {
        for(unsigned i=0; i<N_STATES_; ++i)
                if(obj.graphic[i])
@@ -58,9 +56,14 @@ Part::Loader::~Loader()
                }
 }
 
+void Part::Loader::graphic_normal(const string &n)
+{
+       graphic(NORMAL, n);
+}
+
 void Part::Loader::graphic(State s, const string &n)
 {
-       Graphic *grph = &get_collection().get<Graphic>(n);
+       Graphic *grph = (n.empty() ? nullptr : &get_collection().get<Graphic>(n));
        for(int i=0; i<N_STATES_; ++i)
                if((i&s)==s)
                        obj.graphic[i] = grph;