Improve widget part caching

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

diff --git a/source/button.cpp b/source/button.cpp
index 939d02646249b8d2aec450299edba5f422ea37dc..5582230f95985fc05be05869fa1961c718fc22b2 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -56,13 +56,12 @@ void Button::set_icon(const GL::Texture2D *i)
        rebuild();
 }
 
-void Button::rebuild_special(const Part &part, CachedPart &cache)
+void Button::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.build(part, geom, cache);
+               text.build(part, geom, part_cache);
        if(part.get_name()=="icon")
        {
-               cache.texture = icon;
                if(icon)
                {
                        Geometry rgeom;
@@ -70,9 +69,7 @@ void Button::rebuild_special(const Part &part, CachedPart &cache)
                        rgeom.h = icon->get_height();
                        part.get_alignment().apply(rgeom, geom, part.get_margin());
 
-                       cache.clear_mesh();
-
-                       GL::MeshBuilder bld(*cache.mesh);
+                       GL::MeshBuilder bld(part_cache.create_mesh(part, *icon));
                        bld.color(1.0f, 1.0f, 1.0f);
                        bld.begin(GL::QUADS);
                        bld.texcoord(0, 0);
@@ -127,14 +124,14 @@ void Button::on_style_change()
 
 
 Button::Loader::Loader(Button &btn):
-       Widget::Loader(btn)
+       DataFile::DerivedObjectLoader<Button, Widget::Loader>(btn)
 {
        add("text", &Loader::text);
 }
 
 void Button::Loader::text(const std::string &t)
 {
-       static_cast<Button &>(obj).text = t;
+       obj.text = t;
 }
 
 } // namespace GLtk