Add support for displaying named icons in an Image widget

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

diff --git a/source/image.cpp b/source/image.cpp
index 2735ab611e6a059e73faccae8aa079a0c47e8876..0102a47e487ea8bf4a9efdf29cf1696172820b8f 100644 (file)
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -1,6 +1,8 @@
 #include <msp/gl/meshbuilder.h>
 #include "image.h"
 #include "part.h"
+#include "resources.h"
+#include "root.h"
 #include "style.h"
 
 using namespace std;
@@ -12,47 +14,66 @@ Image::Image(const GL::Texture2D *i):
        image(i),
        keep_aspect(true)
 {
-       focusable = false;
 }
 
-void Image::autosize()
+void Image::autosize_special(const Part &part, Geometry &ageom) const
 {
-       if(!style)
-               return;
-
-       Widget::autosize();
-
-       if(const Part *image_part = style->get_part("image"))
+       if(part.get_name()=="image")
        {
-               const Sides &margin = image_part->get_margin();
+               const Sides &margin = part.get_margin();
                if(image)
                {
-                       geom.w = max(geom.w, image->get_width()+margin.left+margin.right);
-                       geom.h = max(geom.h, image->get_height()+margin.top+margin.bottom);
+                       ageom.w = max(ageom.w, image->get_width()+margin.left+margin.right);
+                       ageom.h = max(ageom.h, image->get_height()+margin.top+margin.bottom);
                }
                else
                {
-                       geom.w = max(geom.w, margin.left+margin.right);
-                       geom.h = max(geom.h, margin.top+margin.bottom);
+                       ageom.w = max(ageom.w, margin.left+margin.right);
+                       ageom.h = max(ageom.h, margin.top+margin.bottom);
                }
        }
-
-       rebuild();
 }
 
 void Image::set_image(const GL::Texture2D *i)
 {
        image = i;
+       icon_name = string();
        signal_autosize_changed.emit();
        rebuild();
 }
 
+void Image::set_icon(const string &n)
+{
+       icon_name = n;
+       update_icon();
+}
+
 void Image::set_keep_aspect(bool ka)
 {
        keep_aspect = ka;
        rebuild();
 }
 
+void Image::update_icon()
+{
+       if(style)
+       {
+               Root *root = find_ancestor<Root>();
+               if(root)
+               {
+                       if(icon_name.empty())
+                               image = 0;
+                       else
+                               image = &root->get_resources().get<GL::Texture2D>(icon_name);
+                       signal_autosize_changed.emit();
+                       rebuild();
+                       return;
+               }
+       }
+
+       image = 0;
+}
+
 void Image::rebuild_special(const Part &part)
 {
        if(part.get_name()=="image")
@@ -83,18 +104,30 @@ void Image::rebuild_special(const Part &part)
 
                GL::MeshBuilder bld(part_cache.create_mesh(part, *image));
                bld.color(1.0f, 1.0f, 1.0f);
-               bld.begin(GL::QUADS);
+               bld.begin(GL::TRIANGLE_STRIP);
+               bld.texcoord(0.0, 1.0);
+               bld.vertex(rgeom.x, rgeom.y+rgeom.h);
                bld.texcoord(0.0, 0.0);
                bld.vertex(rgeom.x, rgeom.y);
-               bld.texcoord(1.0, 0.0);
-               bld.vertex(rgeom.x+rgeom.w, rgeom.y);
                bld.texcoord(1.0, 1.0);
                bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
-               bld.texcoord(0.0, 1.0);
-               bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+               bld.texcoord(1.0, 0.0);
+               bld.vertex(rgeom.x+rgeom.w, rgeom.y);
                bld.end();
        }
 }
 
+void Image::on_style_change()
+{
+       if(!icon_name.empty())
+               update_icon();
+}
+
+void Image::on_reparent()
+{
+       if(!icon_name.empty())
+               update_icon();
+}
+
 } // namespace GLtk
 } // namespace Msp