Update Renderer matrix manipulation calls

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 76b6e615712c29c459d208abe8300671aae5bc6e..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)
 { }
 
@@ -162,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()
@@ -215,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)
        {
@@ -240,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);