Store the Resources reference only in Root widget

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

diff --git a/source/vslider.cpp b/source/vslider.cpp
index 954bb19520702a24033468cecfbf8089bbf3e168..cdd2675952a1bf3ddf2737a08bfc414be01e4d5c 100644 (file)
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -15,17 +15,16 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-VSlider::VSlider(const Resources &r):
-       Slider(r)
+VSlider::VSlider():
+       slider_size(1)
 {
-       update_style();
 }
 
 void VSlider::button_press(int x, int y, unsigned btn)
 {
        if(btn==1 && geom.is_inside_relative(x, y) && max>min)
        {
-               int sy=static_cast<int>((geom.h-slider_size)*(value-min)/(max-min));
+               int sy = static_cast<int>((geom.h-slider_size)*(value-min)/(max-min));
                if(y<sy)
                        set_value(value-step*10);
                else if(y>=static_cast<int>(sy+slider_size))
@@ -51,11 +50,11 @@ void VSlider::render_special(const Part &part) const
 {
        if(part.get_name()=="slider")
        {
-               Alignment align=part.get_alignment();
+               Alignment align = part.get_alignment();
                if(max>min)
-                       align.y=(value-min)/(max-min);
+                       align.y = (value-min)/(max-min);
 
-               Geometry pgeom=part.get_geometry();
+               Geometry pgeom = part.get_geometry();
                align.apply(pgeom, geom, part.get_margin());
 
                GL::push_matrix();
@@ -67,14 +66,16 @@ void VSlider::render_special(const Part &part) const
 
 void VSlider::on_geometry_change()
 {
-       drag_area_size=geom.h-slider_size;
+       drag_area_size = geom.h-slider_size;
 }
 
 void VSlider::on_style_change()
 {
-       for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
-               if(i->get_name()=="slider")
-                       slider_size=i->get_geometry().h;
+       if(!style)
+               return;
+
+       if(const Part *slider_part = style->get_part("slider"))
+               slider_size = slider_part->get_geometry().h;
 
        on_geometry_change();
 }