mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 16:03:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMovieBrowser: try to fix cover arangement

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73ba44155a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-16 (Tue, 16 Feb 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-02-16 10:31:13 +01:00
parent c9f4c87972
commit 0d840df505
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/moviebrowser.cpp
View File

@@ -1390,6 +1390,13 @@ void CMovieBrowser::refreshMovieInfo(void)
newHeader = false; newHeader = false;
} }
if (pic){
if (pic->getPictureName() != fname || !logo_ok){
delete pic; pic = NULL;
}
}
int max_txt_width = 0;
if (m_settings.gui != MB_GUI_FILTER && logo_ok) { if (m_settings.gui != MB_GUI_FILTER && logo_ok) {
lx = m_cBoxFrameInfo.iX + m_cBoxFrameInfo.iWidth - flogo_w -14; lx = m_cBoxFrameInfo.iX + m_cBoxFrameInfo.iWidth - flogo_w -14;
ly = m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2; ly = m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2;
@@ -1399,25 +1406,20 @@ void CMovieBrowser::refreshMovieInfo(void)
flogo_h = flogo_h/2; flogo_h = flogo_h/2;
pic->setYPos(m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2); pic->setYPos(m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2);
} }
pic->setHeight(flogo_h, true); /*flogo_w*/ pic->setHeight(flogo_h, true);
pic->enableFrame(true, 2); pic->enableFrame(true, 2);
pic->enableCache();
pic->doPaintBg(false); pic->doPaintBg(false);
}else flogo_w = pic->getWidth();
pic->setPicture(fname); max_txt_width = m_cBoxFrameInfo.iWidth - flogo_w - 24;
pic->setXPos(m_cBoxFrameInfo.iX + max_txt_width);
flogo_w = pic->getWidth(); }
pic->setXPos(m_cBoxFrameInfo.iX+m_cBoxFrameInfo.iWidth - flogo_w -24); #if 0
if (!m_movieSelectionHandler->epgInfo2.empty()) if (!m_movieSelectionHandler->epgInfo2.empty())
if (m_pcInfo->OnAfterScrollPage.empty()) if (m_pcInfo->OnAfterScrollPage.empty())
m_pcInfo->OnAfterScrollPage.connect(sigc::mem_fun(pic, &CComponentsPicture::paint0)); m_pcInfo->OnAfterScrollPage.connect(sigc::mem_fun(pic, &CComponentsPicture::paint0));
}else{ #endif
if (pic)
delete pic; pic = NULL;
} }
m_pcInfo->setText(&m_movieSelectionHandler->epgInfo2, max_txt_width);
m_pcInfo->setText(&m_movieSelectionHandler->epgInfo2, logo_ok ? m_cBoxFrameInfo.iWidth-flogo_w-20 : 0);
if (pic) if (pic)
pic->paint(CC_SAVE_SCREEN_NO); pic->paint(CC_SAVE_SCREEN_NO);
} }