Simplify constructors with C++11

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

diff --git a/source/image.cpp b/source/image.cpp
index 383f906911993d2a83d8d434ec791f8c0e90d303..8dbf6cf74fe881e6e871be3894e0ae51aa3147b6 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;
@@ -9,8 +11,7 @@ namespace Msp {
 namespace GLtk {
 
 Image::Image(const GL::Texture2D *i):
-       image(i),
-       keep_aspect(true)
+       image(i)
 {
 }
 
@@ -35,14 +36,41 @@ void Image::autosize_special(const Part &part, Geometry &ageom) const
 void Image::set_image(const GL::Texture2D *i)
 {
        image = i;
+       icon_name = string();
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
+}
+
+void Image::set_icon(const string &n)
+{
+       icon_name = n;
+       update_icon();
 }
 
 void Image::set_keep_aspect(bool ka)
 {
        keep_aspect = ka;
-       rebuild();
+       mark_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();
+                       mark_rebuild();
+                       return;
+               }
+       }
+
+       image = 0;
 }
 
 void Image::rebuild_special(const Part &part)
@@ -88,5 +116,24 @@ void Image::rebuild_special(const Part &part)
        }
 }
 
+void Image::on_style_change()
+{
+       if(!icon_name.empty())
+               update_icon();
+}
+
+void Image::on_reparent()
+{
+       if(!icon_name.empty())
+               update_icon();
+}
+
+
+Image::Loader::Loader(Image &img):
+       DataFile::DerivedObjectLoader<Image, Widget::Loader>(img)
+{
+       add("icon", &Image::icon_name);
+}
+
 } // namespace GLtk
 } // namespace Msp