mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +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
------------------
Branch: ni/coolstream
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-08 22:07:57 +01:00
parent 7c4080e761 2149135c85
commit 05ef8b83da
5 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -2347,7 +2347,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
@@ -2363,7 +2363,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;