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

Merge branch 'master' into pu/msgbox

Browse Source 
Origin commit data
------------------
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
This commit is contained in:
Thilo Graf
2016-11-06 23:16:36 +01:00
parent 699d6a311b d9c9f402e9
commit e4bc926b72
4 changed files with 69 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/components/cc_item_infobox.cpp
View File

@@ -83,6 +83,11 @@ CComponentsInfoBox::~CComponentsInfoBox()
void CComponentsInfoBox::setPicture(const std::string& picture_name)
{
pic_name = picture_name;
if (!pic_name.empty()){
int w, h;
frameBuffer->getIconSize(pic_name.c_str(), &w, &h);
height = max(h, height);
}
}
void CComponentsInfoBox::setPicture(const char* picture_name)

11
src/gui/epgview.cpp
View File

@@ -713,10 +713,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
int logo_w = 0;
int logo_h = 0;
int logo_w_max = ox / 4;
if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, g_Zapit->getChannelName(channel_id), lname, &logo_w, &logo_h)) {
if((logo_h > (toph-4)) || (logo_w > logo_w_max)) {
std::string channel_name;
if (mp_info)
channel_name = mp_movie_info->channelName;
else
channel_name = g_Zapit->getChannelName(channel_id);
if (g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, channel_name, lname, &logo_w, &logo_h))
{
if ((logo_h > (toph-4)) || (logo_w > logo_w_max))
g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, toph-4);
}
pic_offx = logo_w + 10;
}