From f3da71097656b7705e45d7880c17e0b335d46ffb Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 11 Nov 2013 08:53:33 +0100 Subject: [PATCH] CImageInfo: fix calculation of info text height Height of sub caption was not considered. --- src/gui/imageinfo.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index edcb265e4..573bfc929 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -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);