Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: 66a3a40db2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
This commit is contained in:
vanhofen
2016-11-14 08:23:53 +01:00

View File

@@ -1537,8 +1537,6 @@ void CMovieBrowser::refreshMovieInfo(void)
{
TRACE("[mb]->%s m_vMovieInfo.size %d\n", __func__, (int)m_vMovieInfo.size());
hideDetailsLine();
// clear m_pcInfo1 text before new init
m_pcInfo1->clear();
@@ -1599,18 +1597,12 @@ void CMovieBrowser::refreshMovieInfo(void)
void CMovieBrowser::hideDetailsLine()
{
refreshDetailsLine(-1);
if (m_detailsLine)
m_detailsLine->hide();
}
void CMovieBrowser::refreshDetailsLine(int pos)
{
if (m_detailsLine)
{
m_detailsLine->kill();
delete m_detailsLine;
m_detailsLine = NULL;
}
if (pos >= 0)
{
int fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST]->getHeight();
@@ -1622,8 +1614,10 @@ void CMovieBrowser::refreshDetailsLine(int pos)
int ypos2 = m_cBoxFrameInfo1.iY + (m_cBoxFrameInfo1.iHeight/2);
if (m_detailsLine == NULL)
m_detailsLine = new CComponentsDetailLine(xpos, ypos1, ypos2, fheight/2, m_cBoxFrameInfo1.iHeight-2*RADIUS_LARGE);
m_detailsLine->paint(false);
m_detailsLine = new CComponentsDetailLine();
m_detailsLine->setDimensionsAll(xpos, ypos1, ypos2, fheight/2, m_cBoxFrameInfo1.iHeight-2*RADIUS_LARGE);
m_detailsLine->paint(true);
}
}