Remove obsolete inside checks

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

diff --git a/source/vslider.cpp b/source/vslider.cpp
index ed2e0bc5123d0a6cfad0b43cdf73f6faf15bc13c..e4c40d8123385ed283c1a1089a1c1346c627d946 100644 (file)
--- a/source/vslider.cpp
+++ b/source/vslider.cpp
@@ -1,12 +1,5 @@
-/* $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 <msp/gl/meshbuilder.h>
 #include "graphic.h"
 #include "part.h"
 #include "style.h"
@@ -15,15 +8,45 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-VSlider::VSlider(const Resources &r):
-       Slider(r)
+VSlider::VSlider():
+       slider_size(1)
+{ }
+
+void VSlider::autosize_special(const Part &part, Geometry &ageom)
+{
+       if(part.get_name()=="slider")
+       {
+               const Sides &margin = part.get_margin();
+               const Geometry &pgeom = part.get_geometry();
+               ageom.w = std::max(ageom.w, pgeom.w+margin.left+margin.right);
+               ageom.h = std::max(ageom.h, pgeom.h*3/2+margin.top+margin.bottom);
+       }
+}
+
+void VSlider::rebuild_special(const Part &part)
 {
-       update_style();
+       if(part.get_name()=="slider")
+       {
+               const Graphic *graphic = part.get_graphic(state);
+               if(!graphic || !graphic->get_texture())
+                       return;
+
+               Alignment align = part.get_alignment();
+               if(max>min)
+                       align.y = (value-min)/(max-min);
+
+               Geometry pgeom = part.get_geometry();
+               align.apply(pgeom, geom, part.get_margin());
+
+               GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
+               bld.matrix() *= GL::Matrix::translation(pgeom.x, pgeom.y, 0);
+               graphic->build(pgeom.w, pgeom.h, bld);
+       }
 }
 
-void VSlider::button_press(int x, int y, unsigned btn)
+void VSlider::button_press(int, int y, unsigned btn)
 {
-       if(btn==1 && geom.is_inside_relative(x, y) && max>min)
+       if(btn==1 && max>min)
        {
                int sy = static_cast<int>((geom.h-slider_size)*(value-min)/(max-min));
                if(y<sy)
@@ -47,24 +70,6 @@ void VSlider::pointer_motion(int, int y)
                drag(y);
 }
 
-void VSlider::render_special(const Part &part) const
-{
-       if(part.get_name()=="slider")
-       {
-               Alignment align = part.get_alignment();
-               if(max>min)
-                       align.y = (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 VSlider::on_geometry_change()
 {
        drag_area_size = geom.h-slider_size;
@@ -72,9 +77,11 @@ void VSlider::on_geometry_change()
 
 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();
 }