Return a reference from Style::get_font

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

diff --git a/source/hslider.cpp b/source/hslider.cpp
index 32d0f6521b98f3ddae610557d71625d30aaed43e..18a163c844258d503f4cb2601387fcc191e4bf81 100644 (file)
--- a/source/hslider.cpp
+++ b/source/hslider.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
 #include "graphic.h"
@@ -15,49 +8,35 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-HSlider::HSlider(const Resources &r):
-       Slider(r)
-{
-       update_style();
-}
+HSlider::HSlider():
+       slider_size(1)
+{ }
 
-void HSlider::button_press(int x, int y, unsigned btn)
+void HSlider::autosize()
 {
-       if(geom.is_inside(x, y))
-       {
-               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;
-                       start_drag(x);
-               }
-       }
-}
+       if(!style)
+               return;
 
-void HSlider::button_release(int, int, unsigned btn)
-{
-       if(btn==1)
+       Widget::autosize();
+
+       if(const Part *slider_part = style->get_part("slider"))
        {
-               end_drag();
-               state=NORMAL;
+               const Sides &margin = slider_part->get_margin();
+               const Geometry &pgeom = slider_part->get_geometry();
+               geom.w = std::max(geom.w, pgeom.w*3/2+margin.left+margin.right);
+               geom.h = std::max(geom.h, pgeom.h+margin.top+margin.bottom);
        }
 }
 
-void HSlider::pointer_motion(int x, int)
-{
-       if(dragging)
-               drag(x);
-}
-
 void HSlider::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.x=(value-min)/(max-min);
+                       align.x = (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,16 +46,44 @@ void HSlider::render_special(const Part &part) const
        }
 }
 
+void HSlider::button_press(int x, int y, unsigned btn)
+{
+       if(btn==1 && geom.is_inside_relative(x, y) && max>min)
+       {
+               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 && dragging)
+               end_drag();
+}
+
+void HSlider::pointer_motion(int x, int)
+{
+       if(dragging)
+               drag(x);
+}
+
 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();
 }