mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
This commit is contained in:
vanhofen
2016-11-08 22:07:57 +01:00
parent 5582d5a8d5 761b3e7f1e
commit 98e986dafc
5 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/moviebrowser/mb.cpp
View File

@@ -1404,13 +1404,10 @@ void CMovieBrowser::refreshChannelLogo(void)
if (m_channelLogo && m_channelLogo->hasLogo())
{
// scale image if required, TODO: move into an own handler, eg. header, so channel logo should be paint in header object
int h_logo = m_channelLogo->getHeight();
if (h_logo > h_logo_max)
{
m_channelLogo->setWidth(0); // force recalculation
// TODO: move into an own handler, eg. header, so channel logo should be paint in header object
m_channelLogo->setWidth(min(m_channelLogo->getWidth(), w_logo_max), true);
if (m_channelLogo->getHeight() > h_logo_max)
m_channelLogo->setHeight(h_logo_max, true);
}
int x = m_cBoxFrame.iX + m_cBoxFrameTitleRel.iX + m_cBoxFrameTitleRel.iWidth - m_channelLogo->getWidth() - OFFSET_INNER_MID;
int y = m_cBoxFrame.iY + m_cBoxFrameTitleRel.iY + (m_cBoxFrameTitleRel.iHeight - m_channelLogo->getHeight())/2;