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

CChannelList/CNeutrinoEventList/CMovieBrowser: fix logo scale

Browse Source 
Downscale was broken.


Origin commit data
------------------
Commit: 1cb885dfe9
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)
This commit is contained in:
Thilo Graf
2015-01-14 19:33:38 +01:00
parent 8c0279c4a0
commit 412889b185
3 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/channellist.cpp
View File

@@ -1663,13 +1663,19 @@ void CChannelList::showChannelLogo()
CChannelLogo->hide(); CChannelLogo->hide();
delete CChannelLogo; delete CChannelLogo;
} }
CChannelLogo = new CComponentsChannelLogo(0, 0, logo_w_max, theight, CChannelLogo = new CComponentsChannelLogo(0, 0, (*chanlist)[selected]->getName(), (*chanlist)[selected]->channel_id);
(*chanlist)[selected]->getName(), (*chanlist)[selected]->channel_id);
if (CChannelLogo->hasLogo()) { if (CChannelLogo->hasLogo()){
CChannelLogo->doScale(theight < CChannelLogo->getHeight()); int h_logo = CChannelLogo->getHeight();
if (h_logo > theight){ //scale image if required, TODO: move into an own handler, eg. header, so channel logo should be paint in header object
uint8_t h_ratio = uint8_t(theight*100/h_logo);
CChannelLogo->setHeight(theight);
int w_logo = h_ratio*CChannelLogo->getWidth()/100;
CChannelLogo->setWidth(min(w_logo, logo_w_max));
CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth()); CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth());
CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2); CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2);
CChannelLogo->paint(); CChannelLogo->paint();
}
} else { } else {
delete CChannelLogo; delete CChannelLogo;
CChannelLogo = NULL; CChannelLogo = NULL;

27
src/gui/eventlist.cpp
View File

@@ -858,17 +858,30 @@ void CNeutrinoEventList::paintHead(t_channel_id _channel_id, std::string _channe
header.setCorner(RADIUS_LARGE, CORNER_TOP); header.setCorner(RADIUS_LARGE, CORNER_TOP);
int x_off = 10; int x_off = 10;
int mid_width = header.getWidth() * 40 / 100; // 40% int mid_width = full_width * 40 / 100; // 40%
int side_width = ((header.getWidth() - mid_width) / 2) - (2 * x_off); int side_width = ((full_width - mid_width) / 2) - (2 * x_off);
CComponentsChannelLogo* midLogo = new CComponentsChannelLogo(CC_CENTERED, CC_CENTERED, _channelname, _channel_id); //create an logo object
CComponentsChannelLogo* midLogo = new CComponentsChannelLogo(0, 0, _channelname, _channel_id, &header);
if (midLogo->hasLogo()) { if (midLogo->hasLogo()) {
header.addCCItem(midLogo); //if logo object has found a logo and was ititialized, the hand it's size
int w_logo = midLogo->getWidth();
//scale image if required, TODO: move into an own handler, eg. header, so channel logo should be paint in header object
int h_logo = midLogo->getHeight();
if (h_logo > theight){
uint8_t h_ratio = uint8_t(theight*100/h_logo);
midLogo->setHeight(theight);
w_logo = h_ratio*w_logo/100;
midLogo->setWidth(w_logo);
}
midLogo->setPos(CC_CENTERED, CC_CENTERED);
// recalc widths // recalc widths
side_width = ((full_width - midLogo->getWidth()) / 2) - (4 * x_off); side_width = ((full_width - w_logo) / 2) - (4 * x_off);
} }
else { else {
delete midLogo; header.removeCCItem(midLogo); //remove/destroy logo object, if it is not available
CComponentsText *midText = new CComponentsText(CC_CENTERED, CC_CENTERED, mid_width, theight, _channelname, CTextBox::CENTER, g_Font[font_mid], &header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); CComponentsText *midText = new CComponentsText(CC_CENTERED, CC_CENTERED, mid_width, theight, _channelname, CTextBox::CENTER, g_Font[font_mid], &header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT);
midText->doPaintBg(false); midText->doPaintBg(false);
} }
@@ -880,7 +893,7 @@ void CNeutrinoEventList::paintHead(t_channel_id _channel_id, std::string _channe
if (!_channelname_next.empty()) { if (!_channelname_next.empty()) {
int name_w = std::min(g_Font[font_lr]->getRenderWidth(_channelname_next), side_width); int name_w = std::min(g_Font[font_lr]->getRenderWidth(_channelname_next), side_width);
int x_pos = header.getWidth() - name_w - x_off; int x_pos = full_width - name_w - x_off;
CComponentsText *rText = new CComponentsText(x_pos, CC_CENTERED, name_w, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr], &header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); CComponentsText *rText = new CComponentsText(x_pos, CC_CENTERED, name_w, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr], &header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT);
rText->doPaintBg(false); rText->doPaintBg(false);
} }

13
src/gui/moviebrowser.cpp
View File

@@ -1259,15 +1259,22 @@ void CMovieBrowser::refreshMovieInfo(void)
CChannelLogo = NULL; CChannelLogo = NULL;
} }
if (old_EpgId != m_movieSelectionHandler->epgEpgId >>16) { if (old_EpgId != m_movieSelectionHandler->epgEpgId >>16) {
CChannelLogo = new CComponentsChannelLogo(0, 0, logo_w_max, m_cBoxFrameTitleRel.iHeight, CChannelLogo = new CComponentsChannelLogo(0, 0, m_movieSelectionHandler->epgChannel, m_movieSelectionHandler->epgEpgId >>16);
m_movieSelectionHandler->epgChannel, m_movieSelectionHandler->epgEpgId >>16);
old_EpgId = m_movieSelectionHandler->epgEpgId >>16; old_EpgId = m_movieSelectionHandler->epgEpgId >>16;
} }
if (CChannelLogo && CChannelLogo->hasLogo()) { if (CChannelLogo && CChannelLogo->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 = CChannelLogo->getHeight();
if (h_logo > m_cBoxFrameTitleRel.iHeight){
uint8_t ratio = m_cBoxFrameTitleRel.iHeight*100/h_logo;
CChannelLogo->setHeight(m_cBoxFrameTitleRel.iHeight);
int w_logo = ratio*CChannelLogo->getWidth()/100;
CChannelLogo->setWidth(min(w_logo, logo_w_max));
}
lx = m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-CChannelLogo->getWidth()-10; lx = m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-CChannelLogo->getWidth()-10;
ly = m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-CChannelLogo->getHeight())/2; ly = m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-CChannelLogo->getHeight())/2;
CChannelLogo->doScale(m_cBoxFrameTitleRel.iHeight < CChannelLogo->getHeight());
CChannelLogo->setXPos(lx - pb_hdd_offset); CChannelLogo->setXPos(lx - pb_hdd_offset);
CChannelLogo->setYPos(ly); CChannelLogo->setYPos(ly);
CChannelLogo->paint(); CChannelLogo->paint();