Rearrange members

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

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 32d0f6521b98f3ddae610557d71625d30aaed43e..e86cc4b17da02f56f8d26906eb2382ab59af0761 100644 (file)
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -15,32 +15,46 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider(const Resources &r):
-       Slider(r)
+HSlider::HSlider():
+       slider_size(1)
+{ }
+
+void HSlider::render_special(const Part &part) const
 {
-       update_style();
+       if(part.get_name()=="slider")
+       {
+               Alignment align = part.get_alignment();
+               if(max>min)
+                       align.x = (value-min)/(max-min);
+
+               Geometry pgeom = part.get_geometry();
+               align.apply(pgeom, geom, part.get_margin());
+
+               GL::push_matrix();
+               GL::translate(pgeom.x, pgeom.y, 0);
+               part.get_graphic(state)->render(pgeom.w, pgeom.h);
+               GL::pop_matrix();
+       }
 }
 
 void HSlider::button_press(int x, int y, unsigned btn)
 {
-       if(geom.is_inside(x, y))
+       if(btn==1 && geom.is_inside_relative(x, y) && max>min)
        {
-               int sx=geom.x+static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
-               if(btn==1 && x>=sx && x<static_cast<int>(sx+slider_size))
-               {
-                       state=ACTIVE;
+               int sx = static_cast<int>((geom.w-slider_size)*(value-min)/(max-min));
+               if(x<sx)
+                       set_value(value-step*10);
+               else if(x>=static_cast<int>(sx+slider_size))
+                       set_value(value+step*10);
+               else
                        start_drag(x);
-               }
        }
 }
 
 void HSlider::button_release(int, int, unsigned btn)
 {
-       if(btn==1)
-       {
+       if(btn==1 && dragging)
                end_drag();
-               state=NORMAL;
-       }
 }
 
 void HSlider::pointer_motion(int x, int)
@@ -49,34 +63,18 @@ void HSlider::pointer_motion(int x, int)
                drag(x);
 }
 
-void HSlider::render_special(const Part &part) const
-{
-       if(part.get_name()=="slider")
-       {
-               Alignment align=part.get_alignment();
-               if(max>min)
-                       align.x=(value-min)/(max-min);
-
-               Geometry pgeom=part.get_geometry();
-               align.apply(pgeom, geom, part.get_margin());
-
-               GL::push_matrix();
-               GL::translate(pgeom.x, pgeom.y, 0);
-               part.get_graphic(state)->render(pgeom.w, pgeom.h);
-               GL::pop_matrix();
-       }
-}
-
 void HSlider::on_geometry_change()
 {
-       drag_area_size=geom.w-slider_size;
+       drag_area_size = geom.w-slider_size;
 }
 
 void HSlider::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().w;
+       if(!style)
+               return;
+
+       if(const Part *slider_part = style->get_part("slider"))
+               slider_size = slider_part->get_geometry().w;
 
        on_geometry_change();
 }