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

CComponentsChannelLogo: disable paint of logo background, it's not required here

Browse Source 
- Fix calculation of logo width & height


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d805054f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-06-28 15:27:26 +02:00
parent 0c2f834e3e
commit 02d85fad41
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/components/cc_item_picture.cpp
View File

@@ -139,8 +139,11 @@ void CComponentsPicture::initCCItem()
//resize/scale image if required, if no icon mode detected, use real image size
if (!is_icon){
if (width != w_pic || height != h_pic)
if (width != w_pic || height != h_pic) {
g_PicViewer->rescaleImageDimensions(&w_pic, &h_pic, width, height);
width = w_pic;
height = h_pic;
}
}
}
@@ -248,11 +251,13 @@ void CComponentsChannelLogo::setChannel(const uint64_t& channelId, const std::st
{
channel_id = channelId;
channel_name = channelName;
int dummy;
has_logo = g_PicViewer->GetLogoName(channel_id, channel_name, pic_name, &width, &height);
has_logo = g_PicViewer->GetLogoName(channel_id, channel_name, pic_name, &dummy, &dummy);
if (!has_logo)
pic_name = alt_pic_name;
initCCItem();
doPaintBg(false);
}