Rework how widget ownership works in Container

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 8b7f1cbd88b351305a83f6dd56b2c9d5e32ac69b..b7dcfc5e0d1ed6d104dde077195fe5f7c79b4870 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,5 +1,6 @@
 #include <msp/gl/matrix.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "container.h"
 #include "resources.h"
 #include "root.h"
@@ -10,20 +11,12 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Widget::Widget():
-       style(0),
-       state(NORMAL),
-       visible(true),
-       focusable(true),
-       parent(0)
-{ }
-
 Widget::~Widget()
 {
        if(parent)
        {
                Container *p = parent;
-               parent = 0;
+               parent = nullptr;
                p->remove(*this);
        }
 }
@@ -51,18 +44,17 @@ void Widget::autosize(Geometry &ageom) const
                return;
 
        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)
+       for(const Part &p: style->get_parts())
        {
-               if(i->get_name().empty())
+               if(p.get_name().empty())
                {
-                       const Geometry &pgeom = i->get_geometry();
-                       const Sides &pmargin = i->get_margin();
+                       const Geometry &pgeom = p.get_geometry();
+                       const Sides &pmargin = p.get_margin();
                        ageom.w = max(ageom.w, pgeom.w+pmargin.left+pmargin.right);
                        ageom.h = max(ageom.h, pgeom.h+pmargin.top+pmargin.bottom);
                }
                else
-                       autosize_special(*i, ageom);
+                       autosize_special(p, ageom);
        }
 }
 
@@ -72,9 +64,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 +84,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)
@@ -110,7 +111,7 @@ void Widget::set_parent(Container *p)
        catch(...)
        {
                // The container has not yet added the widget as its child
-               parent = 0;
+               parent = nullptr;
                throw;
        }
 }
@@ -127,22 +128,18 @@ void Widget::update_style()
        for(top=this; top->parent; top=top->parent) ;
        Root *root = dynamic_cast<Root *>(top);
        if(!root)
-               style = 0;
+               style = nullptr;
        else
        {
                string sname = get_class();
-               if(!style_name.empty())
-               {
-                       sname += '-';
-                       sname += style_name;
-               }
+               append(sname, "-", style_name);
 
                style = &root->get_resources().get<Style>(sname);
        }
 
        on_style_change();
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -160,11 +157,6 @@ void Widget::set_visible(bool v)
        signal_visibility_changed.emit(visible);
 }
 
-void Widget::set_focusable(bool f)
-{
-       focusable = f;
-}
-
 void Widget::set_focus()
 {
        if(!parent)
@@ -185,7 +177,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,14 +217,13 @@ void Widget::rebuild()
        if(!style)
                return;
 
-       part_cache.clear();
-       const Style::PartSeq &parts = style->get_parts();
-       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       PartCache::Rebuild rebuild_cache(part_cache);
+       for(const Part &p: style->get_parts())
        {
-               if(i->get_name().empty())
-                       i->build(geom, state, part_cache);
+               if(p.get_name().empty())
+                       p.build(geom, state, part_cache);
                else
-                       rebuild_special(*i);
+                       rebuild_special(p);
        }
 }
 
@@ -214,18 +237,22 @@ 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);
-       const PartCache::PartList &parts = part_cache.get_parts();
-       for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       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));
+       for(const CachedPart &p: part_cache.get_parts())
        {
-               if(i->mesh && i->texture)
+               if(p.mesh && p.texture)
                {
-                       renderer.set_texture(i->texture);
-                       i->mesh->draw(renderer);
+                       renderer.set_texture(texture_tag, p.texture, &style->get_sampler());
+                       p.mesh->draw(renderer);
                }
-               else if(i->part)
-                       render_special(*i->part, renderer);
+               else if(p.part)
+                       render_special(*p.part, renderer);
        }
 }
 
@@ -239,6 +266,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);