Fix some more inefficient autosizes

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

diff --git a/source/entry.cpp b/source/entry.cpp
index 9129e1b0ebbdd90bef2b641629b271a9fe618f0b..44a169aad7f60283188bc84a3c82c92d2ad56bb8 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -28,7 +28,7 @@ Entry::Entry(const string &t):
        set_text(t);
 }
 
-void Entry::autosize_special(const Part &part, Geometry &ageom)
+void Entry::autosize_special(const Part &part, Geometry &ageom) const
 {
        if(part.get_name()=="text")
        {
@@ -51,11 +51,12 @@ void Entry::autosize_special(const Part &part, Geometry &ageom)
                Geometry sgeom = part.get_geometry();
                if(!sgeom.w || !sgeom.h)
                {
-                       slider->autosize();
+                       Geometry wgeom;
+                       slider->autosize(wgeom);
                        if(!sgeom.w)
-                               sgeom.w = slider->get_geometry().w;
+                               sgeom.w = wgeom.w;
                        if(!sgeom.h)
-                               sgeom.h = slider->get_geometry().h;
+                               sgeom.h = wgeom.h;
                }
 
                const Sides &margin = part.get_margin();
@@ -102,7 +103,7 @@ void Entry::set_multiline(bool m)
 void Entry::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.build(part, geom, first_row, part_cache);
+               text.build(part, state, geom, first_row, part_cache);
        else if(part.get_name()=="cursor")
        {
                const Graphic *graphic = part.get_graphic(state);
@@ -237,11 +238,12 @@ void Entry::reposition_slider()
                Geometry sgeom = slider_part->get_geometry();
                if(!sgeom.w || !sgeom.h)
                {
-                       slider->autosize();
+                       Geometry wgeom;
+                       slider->autosize(wgeom);
                        if(!sgeom.w)
-                               sgeom.w = slider->get_geometry().w;
+                               sgeom.w = wgeom.w;
                        if(!sgeom.h)
-                               sgeom.h = slider->get_geometry().h;
+                               sgeom.h = wgeom.h;
                }
 
                slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
@@ -279,5 +281,18 @@ void Entry::slider_value_changed(double value)
                first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
 }
 
+
+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