Some new datafile keywords

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

diff --git a/source/entry.cpp b/source/entry.cpp
index da127022a84b93b3e26ebd22a2dbc04c689b100a..12eff06ae4ffbc542e3b80726242b60ea03ee4ee 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -28,55 +28,40 @@ Entry::Entry(const string &t):
        set_text(t);
 }
 
-void Entry::autosize()
+void Entry::autosize_special(const Part &part, Geometry &ageom)
 {
-       if(!style)
-               return;
-
-       Widget::autosize();
-
-       if(text_part)
+       if(part.get_name()=="text")
        {
-               const Sides &margin = text_part->get_margin();
+               const Sides &margin = part.get_margin();
                const GL::Font &font = style->get_font();
                unsigned en_width = static_cast<unsigned>(font.get_string_width("n")*style->get_font_size());
-               geom.w = max(geom.w, edit_width*en_width+margin.left+margin.right);
+               ageom.w = max(ageom.w, edit_width*en_width+margin.left+margin.right);
 
                unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*style->get_font_size());
                if(multiline)
                {
                        unsigned line_spacing = style->get_font_size()*6/5;
-                       geom.h = max(geom.h, line_height+line_spacing*(edit_height-1)+margin.top+margin.bottom);
+                       ageom.h = max(ageom.h, line_height+line_spacing*(edit_height-1)+margin.top+margin.bottom);
                }
                else
-                       geom.h = max(geom.h, line_height+margin.top+margin.bottom);
+                       ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
        }
-
-       if(multiline)
+       else if(part.get_name()=="slider" && multiline)
        {
-               if(const Part *slider_part = style->get_part("slider"))
+               Geometry sgeom = part.get_geometry();
+               if(!sgeom.w || !sgeom.h)
                {
-                       Geometry sgeom = slider_part->get_geometry();
-                       if(!sgeom.w || !sgeom.h)
-                       {
-                               slider->autosize();
-                               if(!sgeom.w)
-                                       sgeom.w = slider->get_geometry().w;
-                               if(!sgeom.h)
-                                       sgeom.h = slider->get_geometry().h;
-                       }
-
-                       const Sides &margin = slider_part->get_margin();
-                       geom.w = max(geom.w, sgeom.w+margin.left+margin.right);
-                       geom.h = max(geom.h, sgeom.h+margin.top+margin.bottom);
-
-                       reposition_slider();
+                       slider->autosize();
+                       if(!sgeom.w)
+                               sgeom.w = slider->get_geometry().w;
+                       if(!sgeom.h)
+                               sgeom.h = slider->get_geometry().h;
                }
 
-               check_view_range();
+               const Sides &margin = part.get_margin();
+               ageom.w = max(ageom.w, sgeom.w+margin.left+margin.right);
+               ageom.h = max(ageom.h, sgeom.h+margin.top+margin.bottom);
        }
-
-       rebuild();
 }
 
 void Entry::set_text(const string &t)
@@ -114,37 +99,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 || 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
@@ -302,9 +280,17 @@ void Entry::slider_value_changed(double value)
 }
 
 
-Entry::Loader::Loader(Entry &ent):
-       Widget::Loader(ent)
-{ }
+Entry::Loader::Loader(Entry &e):
+       DataFile::DerivedObjectLoader<Entry, Widget::Loader>(e)
+{
+       add("edit_size", &Entry::edit_width, &Entry::edit_height);
+       add("multiline", &Loader::multiline);
+}
+
+void Entry::Loader::multiline(bool m)
+{
+       obj.set_multiline(m);
+}
 
 } // namespace GLtk
 } // namespace Msp