Style and comment updates

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

diff --git a/source/image.cpp b/source/image.cpp
index 0102a47e487ea8bf4a9efdf29cf1696172820b8f..6e24d71b13a42df36a0f2f23b5442dc3406f28a1 100644 (file)
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -11,10 +11,8 @@ namespace Msp {
 namespace GLtk {
 
 Image::Image(const GL::Texture2D *i):
-       image(i),
-       keep_aspect(true)
-{
-}
+       image(i)
+{ }
 
 void Image::autosize_special(const Part &part, Geometry &ageom) const
 {
@@ -39,7 +37,7 @@ 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)
@@ -51,27 +49,23 @@ void Image::set_icon(const string &n)
 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();
-                       rebuild();
-                       return;
-               }
-       }
+       image = nullptr;
+       if(!style)
+               return;
 
-       image = 0;
+       Root *root = find_ancestor<Root>();
+       if(!root)
+               return;
+
+       if(!icon_name.empty())
+               image = &root->get_resources().get<GL::Texture2D>(icon_name);
+       signal_autosize_changed.emit();
+       mark_rebuild();
 }
 
 void Image::rebuild_special(const Part &part)
@@ -129,5 +123,12 @@ void Image::on_reparent()
                update_icon();
 }
 
+
+Image::Loader::Loader(Image &img):
+       DataFile::DerivedObjectLoader<Image, Widget::Loader>(img)
+{
+       add("icon", &Image::icon_name);
+}
+
 } // namespace GLtk
 } // namespace Msp