Merge branch 'master' into pu/fb-setmode

This commit is contained in:
2017-05-11 08:43:29 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -330,10 +330,10 @@ void CComponentsHeader::initLogo()
//set final logo position
int x_logo = 0;
if (cch_logo.Align == CC_LOGO_RIGHT){
if (cch_caption_align == CTextBox::RIGHT)
if (cch_caption_align == CTextBox::RIGHT){
if (cch_text_obj)
x_logo = cch_text_obj->getXPos() - cch_logo_obj->getWidth();
else
}else
x_logo = x_logo_right;
}
if (cch_logo.Align == CC_LOGO_LEFT)