Minor refactoring

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

diff --git a/source/image.cpp b/source/image.cpp
index 1da782d28a2579e66d4079d8ffb915f703627255..448da7b985e14664730a1dc33b9994df98bcecbb 100644 (file)
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -11,8 +11,7 @@ namespace Msp {
 namespace GLtk {
 
 Image::Image(const GL::Texture2D *i):
-       image(i),
-       keep_aspect(true)
+       image(i)
 {
 }
 
@@ -39,7 +38,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 +50,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;
+
+       Root *root = find_ancestor<Root>();
+       if(!root)
+               return;
 
-       image = 0;
+       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)