mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

CImageInfo: fix calculation of info text height

Browse Source 
Height of sub caption was not considered.
This commit is contained in:
Thilo Graf
2013-11-11 08:53:33 +01:00
parent ac6f547d0f
commit f3da710976
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/imageinfo.cpp
View File

@@ -352,13 +352,6 @@ void CImageInfo::InitInfoText(const std::string& text)
int h_body = winbody->getHeight();
int w_body = winbody->getWidth();
int h_lic = h_body - cc_info->getHeight() - 2*item_offset;
if (cc_lic == NULL)
cc_lic = new CComponentsInfoBox(CC_CENTERED, CC_APPEND, w_body-2*item_offset, h_lic);
cc_lic->setSpaceOffset(1);
cc_lic->setText(text, CTextBox::TOP | CTextBox::AUTO_WIDTH | CTextBox::SCROLL, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]);
//add a caption for info contents
Font * caption_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU];
int caption_height = caption_font->getHeight();
@@ -368,6 +361,14 @@ void CImageInfo::InitInfoText(const std::string& text)
if (!cc_sub_caption->isAdded())
cc_win->addWindowItem(cc_sub_caption);
//add info text box
int h_txt = h_body - item_offset - cc_info->getHeight() - cc_sub_caption->getHeight() - item_offset;
if (cc_lic == NULL)
cc_lic = new CComponentsInfoBox(CC_CENTERED, CC_APPEND, w_body-2*item_offset, h_txt);
cc_lic->setSpaceOffset(1);
cc_lic->setText(text, CTextBox::TOP | CTextBox::AUTO_WIDTH | CTextBox::SCROLL, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT]);
//add text to container
if (!cc_lic->isAdded())
cc_win->addWindowItem(cc_lic);