X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fslider.cpp;h=29f906766ea52c087bb25a707ebc248677aa456a;hb=9678abb23abe450109e2feda081f5bba5f20cc94;hp=70798af9c24a814f262777d5dbc0064912cb2096;hpb=5f73de83d46138faa2b4c1b0a725d0a705988388;p=libs%2Fgltk.git diff --git a/source/slider.cpp b/source/slider.cpp index 70798af..29f9067 100644 --- a/source/slider.cpp +++ b/source/slider.cpp @@ -9,18 +9,7 @@ namespace Msp { namespace GLtk { Slider::Slider(Direction d): - dir(d), - min(0), - max(1), - value(0), - step(0.1), - page_size(0.25), - dragging(false), - drag_area_size(0), - drag_area_offset(0), - slider_min_size(1), - slider_size(1), - total_margin(0) + dir(d) { } void Slider::set_value(double v) @@ -106,7 +95,7 @@ void Slider::rebuild_special(const Part &part) slider_size = (dir==HORIZONTAL ? rgeom.w : rgeom.h); GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture())); - bld.matrix() *= GL::Matrix::translation(sgeom.x+rgeom.x, sgeom.y+rgeom.y, 0); + bld.transform(GL::Matrix::translation(sgeom.x+rgeom.x, sgeom.y+rgeom.y, 0)); graphic->build(rgeom.w, rgeom.h, bld); } } @@ -164,7 +153,7 @@ void Slider::on_style_change() if(!style) return; - if(const Part *slider_part = style->get_part("slider")) + if(const Part *slider_part = style->find_part("slider")) { const Geometry &pgeom = slider_part->get_geometry(); const Sides &margin = slider_part->get_margin();