Cache widget parts in meshes

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

diff --git a/source/list.cpp b/source/list.cpp
index a886118ed6c98b8341effd74de1d6fc4c6f61018..19559d1d05b8f51606fc2cd36a4bce5689344901 100644 (file)
--- a/source/list.cpp
+++ b/source/list.cpp
@@ -1,6 +1,5 @@
-#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
+#include <msp/gl/meshbuilder.h>
 #include "graphic.h"
 #include "list.h"
 #include "part.h"
@@ -74,6 +73,7 @@ void List::autosize_rows(unsigned n)
        }
 
        check_view_range();
+       rebuild();
 }
 
 void List::autosize_all()
@@ -84,8 +84,7 @@ void List::autosize_all()
 void List::append(const string &v)
 {
        items.push_back(v);
-       check_view_range();
-       signal_autosize_changed.emit();
+       items_changed();
 }
 
 void List::insert(unsigned i, const string &v)
@@ -94,8 +93,7 @@ void List::insert(unsigned i, const string &v)
                throw out_of_range("List::insert");
 
        items.insert(items.begin()+i, v);
-       check_view_range();
-       signal_autosize_changed.emit();
+       items_changed();
 }
 
 void List::remove(unsigned i)
@@ -109,17 +107,21 @@ void List::remove(unsigned i)
        else if(sel_index==static_cast<int>(i))
                sel_index = -1;
 
-       check_view_range();
-       signal_autosize_changed.emit();
+       items_changed();
 }
 
 void List::clear()
 {
        items.clear();
        sel_index = -1;
+       items_changed();
+}
 
+void List::items_changed()
+{
        check_view_range();
        signal_autosize_changed.emit();
+       rebuild();
 }
 
 void List::set_selected_index(int i)
@@ -143,7 +145,7 @@ const string &List::get_selected() const
        return items[sel_index];
 }
 
-void List::render_special(const Part &part) const
+void List::rebuild_special(const Part &part, CachedPart &cache)
 {
        if(part.get_name()=="items")
        {
@@ -151,14 +153,23 @@ void List::render_special(const Part &part) const
                Geometry pgeom = geom;
                pgeom.h = row_height+margin.top+margin.bottom;
 
-               GL::PushMatrix push_mtx;
-               GL::translate(0, geom.h-pgeom.h, 0);
+               const GL::Font &font = style->get_font();
+               cache.texture = &font.get_texture();
+               cache.clear_mesh();
+
+               GL::MeshBuilder bld(*cache.mesh);
+               bld.color(style->get_font_color());
+               bld.matrix() *= GL::Matrix::translation(pgeom.x, pgeom.y+geom.h-pgeom.h, 0);
 
                for(unsigned i=0; (i<n_visible && first+i<items.size()); ++i)
                {
                        if(i!=0)
-                               GL::translate(0, -static_cast<int>(row_height), 0);
-                       Text(*style, items[first+i]).render(part, pgeom);
+                               bld.matrix() *= GL::Matrix::translation(0, -static_cast<int>(row_height), 0);
+
+                       GL::MatrixStack::Push _pushm(bld.matrix());
+                       bld.matrix() *= GL::Matrix::scaling(style->get_font_size());
+
+                       style->get_font().build_string(items[first+i], bld);
                }
        }
        else if(part.get_name()=="selection")
@@ -176,13 +187,21 @@ void List::render_special(const Part &part) const
                        rgeom.x += margin.left;
                        part.get_alignment().apply(rgeom, pgeom);
 
-                       GL::push_matrix();
-                       GL::translate(rgeom.x, rgeom.y, 0);
-                       part.get_graphic(state)->render(rgeom.w, rgeom.h);
-                       GL::pop_matrix();
+                       cache.texture = part.get_graphic(state)->get_texture();
+                       cache.clear_mesh();
+
+                       GL::MeshBuilder bld(*cache.mesh);
+                       bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+                       part.get_graphic(state)->build(rgeom.w, rgeom.h, bld);
                }
+               else
+                       cache.texture = 0;
        }
-       else if(part.get_name()=="slider")
+}
+
+void List::render_special(const Part &part) const
+{
+       if(part.get_name()=="slider")
                slider.render();
 }
 
@@ -200,6 +219,7 @@ void List::button_press(int x, int y, unsigned btn)
                        sel_index = first+i;
 
                        signal_item_selected.emit(sel_index, items[sel_index]);
+                       rebuild();
                }
        }
 }
@@ -276,7 +296,10 @@ void List::check_view_range()
 void List::slider_value_changed(double value)
 {
        if(items.size()>n_visible)
+       {
                first = items.size()-n_visible-static_cast<unsigned>(value);
+               rebuild();
+       }
 }