Defer widget rebuild to just before they are rendered

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

diff --git a/source/widget.cpp b/source/widget.cpp
index b40aa75214f2855def232ebbd48a6f85b7b3fb66..1c73d7640cc610c49ccb33f6e7f4b0fe315a83d0 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -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();
        }
 }
 
@@ -142,7 +141,7 @@ void Widget::update_style()
 
        on_style_change();
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -185,7 +184,7 @@ void Widget::set_state(State mask, State bits)
        State old_state = state;
        state = (state&~mask)|bits;
        if(style && style->compare_states(old_state, state))
-               rebuild();
+               mark_rebuild();
 }
 
 void Widget::set_animation_interval(const Time::TimeDelta &iv)
@@ -202,12 +201,30 @@ 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()
 {
        if(!style)
                return;
 
-       part_cache.begin_rebuild();
+       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)
        {
@@ -216,7 +233,6 @@ void Widget::rebuild()
                else
                        rebuild_special(*i);
        }
-       part_cache.end_rebuild();
 }
 
 void Widget::rebuild_special(const Part &part)