CComponentsPicture: Change order of called base methodes setWidth/Height

Calls of base methods should come after internal method calls.
Values could be changed unintentionally.
This commit is contained in:
2017-04-21 22:47:23 +02:00
parent 68835056c3
commit ed5e79440a

View File

@@ -128,9 +128,9 @@ void CComponentsPicture::setPicture(const char* picture_name)
void CComponentsPicture::setWidth(const int& w, bool keep_aspect)
{
CComponentsItem::setWidth(w);
if (w == width && keep_aspect == keep_dy_aspect)
return;
CComponentsItem::setWidth(w);
need_init = true;
do_scale = true;
keep_dy_aspect = keep_aspect;
@@ -139,9 +139,9 @@ void CComponentsPicture::setWidth(const int& w, bool keep_aspect)
void CComponentsPicture::setHeight(const int& h, bool keep_aspect)
{
CComponentsItem::setHeight(h);
if (h == height && keep_aspect == keep_dx_aspect)
return;
CComponentsItem::setHeight(h);
need_init = true;
do_scale = true;
keep_dx_aspect = keep_aspect;