mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp
This commit is contained in:
Thilo Graf
2016-11-10 10:27:22 +01:00
parent 996beed078 098905e8e1
commit 3efaac5725
22 changed files with 707 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -2255,7 +2255,7 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c
else if (g_settings.infobar_show_channellogo == 2 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6) // paint logo in place of channel name
{
// check logo dimensions
g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, chan_w, header_height);
g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, chan_w, header_height - 2*OFFSET_INNER_MIN);
// hide channel name
// this is too ugly... ChannelName = "";
// calculate logo position
@@ -2271,7 +2271,7 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c
{
// check logo dimensions
int Logo_max_width = chan_w - logo_w - 10;
g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, Logo_max_width, header_height);
g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, Logo_max_width, header_height - 2*OFFSET_INNER_MIN);
// calculate logo position
y_mid = ChanNameY + header_height / 2;
logo_x = start_x + 10;