mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 08:21:12 +02:00
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:
@@ -128,9 +128,9 @@ void CComponentsPicture::setPicture(const char* picture_name)
|
|||||||
|
|
||||||
void CComponentsPicture::setWidth(const int& w, bool keep_aspect)
|
void CComponentsPicture::setWidth(const int& w, bool keep_aspect)
|
||||||
{
|
{
|
||||||
CComponentsItem::setWidth(w);
|
|
||||||
if (w == width && keep_aspect == keep_dy_aspect)
|
if (w == width && keep_aspect == keep_dy_aspect)
|
||||||
return;
|
return;
|
||||||
|
CComponentsItem::setWidth(w);
|
||||||
need_init = true;
|
need_init = true;
|
||||||
do_scale = true;
|
do_scale = true;
|
||||||
keep_dy_aspect = keep_aspect;
|
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)
|
void CComponentsPicture::setHeight(const int& h, bool keep_aspect)
|
||||||
{
|
{
|
||||||
CComponentsItem::setHeight(h);
|
|
||||||
if (h == height && keep_aspect == keep_dx_aspect)
|
if (h == height && keep_aspect == keep_dx_aspect)
|
||||||
return;
|
return;
|
||||||
|
CComponentsItem::setHeight(h);
|
||||||
need_init = true;
|
need_init = true;
|
||||||
do_scale = true;
|
do_scale = true;
|
||||||
keep_dx_aspect = keep_aspect;
|
keep_dx_aspect = keep_aspect;
|
||||||
|
Reference in New Issue
Block a user