Store the Resources reference only in Root widget

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

diff --git a/source/entry.cpp b/source/entry.cpp
index 1439d426acce4854bf1ecdcb3babd25985f1d20a..2c9cb357fa55d38215c64358b4f1ae22fe972932 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -20,9 +20,7 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Entry::Entry(const Resources &r, const string &t):
-       Widget(r),
-       Container(r),
+Entry::Entry(const string &t):
        text(),
        multiline(false),
        edit_pos(0),
@@ -31,7 +29,6 @@ Entry::Entry(const Resources &r, const string &t):
        text_part(0),
        slider(0)
 {
-       update_style();
        set_text(t);
 }
 
@@ -39,18 +36,25 @@ void Entry::set_text(const string &t)
 {
        text = t;
        edit_pos = text.size();
+
+       if(multiline)
+               check_view_range();
 }
 
 void Entry::set_multiline(bool m)
 {
        multiline = m;
-       if(multiline && !slider)
+       if(multiline)
        {
-               slider = new VSlider(res);
-               add(*slider);
-               slider->set_step(1);
-               slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
-               reposition_slider();
+               if(!slider)
+               {
+                       slider = new VSlider;
+                       add(*slider);
+                       slider->set_step(1);
+                       slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
+                       reposition_slider();
+               }
+               check_view_range();
        }
 }
 
@@ -145,19 +149,32 @@ void Entry::render_special(const Part &part) const
 void Entry::on_geometry_change()
 {
        reposition_slider();
+
+       if(multiline)
+               check_view_range();
 }
 
 void Entry::on_style_change()
 {
+       text.set_style(style);
+
+       if(!style)
+       {
+               text_part = 0;
+               return;
+       }
+
        text_part = style->get_part("text");
 
-       text.set_style(style);
        reposition_slider();
+
+       if(multiline)
+               check_view_range();
 }
 
 void Entry::reposition_slider()
 {
-       if(!slider)
+       if(!style || !slider)
                return;
 
        if(const Part *slider_part = style->get_part("slider"))