X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.cpp;h=655ecc252d2b81aa3187195e6d662611835e283a;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hp=1da782d28a2579e66d4079d8ffb915f703627255;hpb=78e05360d70542d343401241ff9ddddfed18c5cd;p=libs%2Fgltk.git diff --git a/source/image.cpp b/source/image.cpp index 1da782d..655ecc2 100644 --- 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,7 +50,7 @@ void Image::set_icon(const string &n) void Image::set_keep_aspect(bool ka) { keep_aspect = ka; - rebuild(); + mark_rebuild(); } void Image::update_icon() @@ -62,16 +61,16 @@ void Image::update_icon() if(root) { if(icon_name.empty()) - image = 0; + image = nullptr; else image = &root->get_resources().get(icon_name); signal_autosize_changed.emit(); - rebuild(); + mark_rebuild(); return; } } - image = 0; + image = nullptr; } void Image::rebuild_special(const Part &part)