Update Renderer matrix manipulation calls

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 13c5174df43e33cc6db256bbbe47ec45d3de7c4a..aa05675b97c1c989c499916247173785593dad5c 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)
 { }
 
@@ -39,13 +39,18 @@ void Widget::set_size(unsigned w, unsigned h)
 }
 
 void Widget::autosize()
+{
+       Geometry ageom;
+       autosize(ageom);
+       set_geometry(ageom);
+}
+
+void Widget::autosize(Geometry &ageom) const
 {
        if(!style)
                return;
 
-       Geometry ageom;
-       ageom.x = geom.x;
-       ageom.y = geom.y;
+       ageom = Geometry(geom.x, geom.y, 0, 0);
        const Style::PartSeq &parts = style->get_parts();
        for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
@@ -59,8 +64,6 @@ void Widget::autosize()
                else
                        autosize_special(*i, ageom);
        }
-
-       set_geometry(ageom);
 }
 
 void Widget::set_geometry(const Geometry &g)
@@ -75,6 +78,21 @@ void Widget::set_geometry(const Geometry &g)
        }
 }
 
+void Widget::map_coords_to_ancestor(int &x, int &y, const Widget &ancestor) const
+{
+       for(const Widget *w=this; w; w=w->get_parent())
+       {
+               if(w==&ancestor)
+                       return;
+
+               const Geometry &wgeom = w->get_geometry();
+               x += wgeom.x;
+               y += wgeom.y;
+       }
+
+       throw hierarchy_error("not an ancestor");
+}
+
 void Widget::set_parent(Container *p)
 {
        if(parent && p)
@@ -144,7 +162,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()
@@ -157,10 +175,17 @@ void Widget::set_focus()
        signal_request_focus.emit();
 }
 
+void Widget::set_enabled(bool e)
+{
+       set_state(DISABLED, (e ? NORMAL : DISABLED));
+}
+
 void Widget::set_state(State mask, State bits)
 {
+       State old_state = state;
        state = (state&~mask)|bits;
-       rebuild();
+       if(style && style->compare_states(old_state, state))
+               rebuild();
 }
 
 void Widget::rebuild()
@@ -168,7 +193,7 @@ void Widget::rebuild()
        if(!style)
                return;
 
-       part_cache.clear();
+       part_cache.begin_rebuild();
        const Style::PartSeq &parts = style->get_parts();
        for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
@@ -177,6 +202,7 @@ void Widget::rebuild()
                else
                        rebuild_special(*i);
        }
+       part_cache.end_rebuild();
 }
 
 void Widget::rebuild_special(const Part &part)
@@ -189,8 +215,8 @@ 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);
+       GL::Renderer::Push _push(renderer);
+       renderer.transform(GL::Matrix::translation(geom.x, geom.y, 0));
        const PartCache::PartList &parts = part_cache.get_parts();
        for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
@@ -214,6 +240,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);