Adjust things to conform to changes in other libraries

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 8b7f1cbd88b351305a83f6dd56b2c9d5e32ac69b..92cbaae9ba9a3fc4e9c9fc8c1381010481a90d70 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -14,7 +14,7 @@ Widget::Widget():
        style(0),
        state(NORMAL),
        visible(true),
-       focusable(true),
+       input_type(INPUT_NONE),
        parent(0)
 { }
 
@@ -72,9 +72,8 @@ void Widget::set_geometry(const Geometry &g)
        geom = g;
        if(size_changed)
        {
-               // TODO maybe rename this to on_size_change
-               on_geometry_change();
-               rebuild();
+               on_size_change();
+               mark_rebuild();
        }
 }
 
@@ -93,6 +92,16 @@ void Widget::map_coords_to_ancestor(int &x, int &y, const Widget &ancestor) cons
        throw hierarchy_error("not an ancestor");
 }
 
+void Widget::map_coords_to_root(int &x, int &y) const
+{
+       for(const Widget *w=this; w; w=w->get_parent())
+       {
+               const Geometry &wgeom = w->get_geometry();
+               x += wgeom.x;
+               y += wgeom.y;
+       }
+}
+
 void Widget::set_parent(Container *p)
 {
        if(parent && p)
@@ -142,7 +151,7 @@ void Widget::update_style()
 
        on_style_change();
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -162,7 +171,7 @@ void Widget::set_visible(bool v)
 
 void Widget::set_focusable(bool f)
 {
-       focusable = f;
+       input_type = (f ? INPUT_TEXT : INPUT_NONE);
 }
 
 void Widget::set_focus()
@@ -185,7 +194,39 @@ void Widget::set_state(State mask, State bits)
        State old_state = state;
        state = (state&~mask)|bits;
        if(style && style->compare_states(old_state, state))
+               mark_rebuild();
+}
+
+void Widget::set_animation_interval(const Time::TimeDelta &iv)
+{
+       if(iv<Time::zero)
+               throw invalid_argument("Widget::set_animation_interval");
+
+       anim_interval = iv;
+       signal_request_animation.emit(anim_interval);
+}
+
+void Widget::stop_animation()
+{
+       set_animation_interval(Time::zero);
+}
+
+void Widget::mark_rebuild()
+{
+       if(rebuild_needed)
+               return;
+
+       rebuild_needed = true;
+       signal_rebuild_needed.emit();
+}
+
+void Widget::rebuild_hierarchy()
+{
+       if(rebuild_needed)
+       {
+               rebuild_needed = false;
                rebuild();
+       }
 }
 
 void Widget::rebuild()
@@ -193,7 +234,7 @@ void Widget::rebuild()
        if(!style)
                return;
 
-       part_cache.clear();
+       PartCache::Rebuild rebuild_cache(part_cache);
        const Style::PartSeq &parts = style->get_parts();
        for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
@@ -214,14 +255,19 @@ void Widget::render(GL::Renderer &renderer) const
        if(!style)
                throw logic_error(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
 
-       GL::MatrixStack::Push _pushm(renderer.matrix_stack());
-       renderer.matrix_stack() *= GL::Matrix::translation(geom.x, geom.y, 0);
+       static const GL::Tag texture_tag("ui_tex");
+
+       GL::Renderer::Push _push(renderer);
+       int x = 0;
+       int y = 0;
+       map_coords_to_root(x, y);
+       renderer.set_matrix(GL::Matrix::translation(x, y, 0));
        const PartCache::PartList &parts = part_cache.get_parts();
        for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
                if(i->mesh && i->texture)
                {
-                       renderer.set_texture(i->texture);
+                       renderer.set_texture(texture_tag, i->texture, &style->get_sampler());
                        i->mesh->draw(renderer);
                }
                else if(i->part)
@@ -239,6 +285,24 @@ void Widget::pointer_leave()
        clear_state(HOVER);
 }
 
+void Widget::touch_press(int x, int y, unsigned finger)
+{
+       if(finger==0)
+               button_press(x, y, 1);
+}
+
+void Widget::touch_release(int x, int y, unsigned finger)
+{
+       if(finger==0)
+               button_release(x, y, 1);
+}
+
+void Widget::touch_motion(int x, int y, unsigned finger)
+{
+       if(finger==0)
+               pointer_motion(x, y);
+}
+
 void Widget::focus_in()
 {
        set_state(FOCUS);