CComponentsInfoBox: ensure matching object height after assigned image

Images are not defined with constructor, so it is possible we must
consider the image height after called setPicture() methode.
This is important if an infobox sould be
added into a cc form object. This avoids overlapping of dynamic added items.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 18695fb0c9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
2016-11-05 21:13:58 +01:00
parent 0e3c24452f
commit 09beeabc34

View File

@@ -83,6 +83,11 @@ CComponentsInfoBox::~CComponentsInfoBox()
void CComponentsInfoBox::setPicture(const std::string& picture_name)
{
pic_name = picture_name;
if (!pic_name.empty()){
int w, h;
frameBuffer->getIconSize(pic_name.c_str(), &w, &h);
height = max(h, height);
}
}
void CComponentsInfoBox::setPicture(const char* picture_name)