X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fbutton.cpp;h=5582230f95985fc05be05869fa1961c718fc22b2;hp=b881b3f97fd8b52394b2e6bf9be1bd9869621598;hb=319cde3c06181ba1c3619567525002926d8b4889;hpb=768c65e13861f72929290ac2513df9975579e543 diff --git a/source/button.cpp b/source/button.cpp index b881b3f..5582230 100644 --- 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);