infoviewer: use small vertical offset around channellogo

Origin commit data
------------------
Branch: ni/coolstream
Commit: 21b2fbd03c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- infoviewer: use small vertical offset around channellogo

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-08 22:02:57 +01:00
parent 16d1168a28
commit 92f79c9f15

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 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 // 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 // hide channel name
// this is too ugly... ChannelName = ""; // this is too ugly... ChannelName = "";
// calculate logo position // calculate logo position
@@ -2271,7 +2271,7 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c
{ {
// check logo dimensions // check logo dimensions
int Logo_max_width = chan_w - logo_w - 10; 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 // calculate logo position
y_mid = ChanNameY + header_height / 2; y_mid = ChanNameY + header_height / 2;
logo_x = start_x + 10; logo_x = start_x + 10;