mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMovieBrowser: fix arrangement of movieinfo text

Browse Source 
This should fix empty boxes in info window and text width in EPG-info text
in.
Current cover width was not considered.
This commit is contained in:
Thilo Graf
2016-02-17 09:35:47 +01:00
parent 5100b3d6ae
commit d14bbf2bb5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/moviebrowser.cpp
View File

@@ -1396,9 +1396,8 @@ void CMovieBrowser::refreshMovieInfo(void)
} }
} }
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_cBoxFrameBrowserList.iWidth - flogo_w -14;
ly = m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2; ly = m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2;
if (pic == NULL){ //TODO: paint custom covers with different ratio, currently only works with default ratio HD 16/9 if (pic == NULL){ //TODO: paint custom covers with different ratio, currently only works with default ratio HD 16/9
pic = new CComponentsPicture(lx, ly, fname, NULL, CC_SHADOW_ON, COL_MENUCONTENTDARK_PLUS_0); pic = new CComponentsPicture(lx, ly, fname, NULL, CC_SHADOW_ON, COL_MENUCONTENTDARK_PLUS_0);
@@ -1410,8 +1409,7 @@ void CMovieBrowser::refreshMovieInfo(void)
pic->enableFrame(true, 2); pic->enableFrame(true, 2);
pic->doPaintBg(false); pic->doPaintBg(false);
flogo_w = pic->getWidth(); flogo_w = pic->getWidth();
max_txt_width = m_cBoxFrameInfo.iWidth - flogo_w - 24; pic->setXPos(m_cBoxFrameInfo.iX + m_cBoxFrameInfo.iWidth - flogo_w - 24);
pic->setXPos(m_cBoxFrameInfo.iX + max_txt_width);
} }
#if 0 #if 0
if (!m_movieSelectionHandler->epgInfo2.empty()) if (!m_movieSelectionHandler->epgInfo2.empty())
@@ -1419,7 +1417,9 @@ void CMovieBrowser::refreshMovieInfo(void)
m_pcInfo->OnAfterScrollPage.connect(sigc::mem_fun(pic, &CComponentsPicture::paint0)); m_pcInfo->OnAfterScrollPage.connect(sigc::mem_fun(pic, &CComponentsPicture::paint0));
#endif #endif
} }
m_pcInfo->setText(&m_movieSelectionHandler->epgInfo2, max_txt_width); if (pic)
flogo_w = pic->getWidth();
m_pcInfo->setText(&m_movieSelectionHandler->epgInfo2, m_cBoxFrameInfo.iWidth - flogo_w - 24);
if (pic) if (pic)
pic->paint(CC_SAVE_SCREEN_NO); pic->paint(CC_SAVE_SCREEN_NO);
} }