X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fentry.cpp;h=a635101404423e9b64524ad7dfee6b9471b53c24;hp=1f778420e0b44eda8b86b5765320f926048cdd27;hb=319cde3c06181ba1c3619567525002926d8b4889;hpb=768c65e13861f72929290ac2513df9975579e543 diff --git a/source/entry.cpp b/source/entry.cpp index 1f77842..a635101 100644 --- a/source/entry.cpp +++ b/source/entry.cpp @@ -114,37 +114,30 @@ void Entry::set_multiline(bool m) } } -void Entry::rebuild_special(const Part &part, CachedPart &cache) +void Entry::rebuild_special(const Part &part) { if(part.get_name()=="text") - text.build(part, geom, first_row, cache); + text.build(part, geom, first_row, part_cache); else if(part.get_name()=="cursor") { const Graphic *graphic = part.get_graphic(state); - if(!text_part || !graphic) - { - cache.texture = 0; + if(!text_part || !graphic || !graphic->get_texture()) return; - } unsigned row, col; text.offset_to_coords(edit_pos, row, col); if(row=first_row+visible_rows) - { - cache.texture = 0; return; - } Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col); - cache.texture = graphic->get_texture(); - cache.clear_mesh(); - - GL::MeshBuilder bld(*cache.mesh); + GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture())); bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0); graphic->build(part.get_geometry().w, part.get_geometry().h, bld); } + else + Widget::rebuild_special(part); } void Entry::render_special(const Part &part, GL::Renderer &renderer) const