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

infoviewer: remove LEFT_OFFSET define

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3913ee4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-09 (Tue, 09 Jan 2018)

Origin message was:
------------------
- infoviewer: remove LEFT_OFFSET define

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-01-09 11:14:08 +01:00
parent 81b73af840
commit b75d1e1041
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
View File

@@ -89,9 +89,6 @@ extern CBouquetList * bouquetList; /* neutrino.cpp */
extern CPictureViewer * g_PicViewer; extern CPictureViewer * g_PicViewer;
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
#define LEFT_OFFSET 5
event_id_t CInfoViewer::last_curr_id = 0, CInfoViewer::last_next_id = 0; event_id_t CInfoViewer::last_curr_id = 0, CInfoViewer::last_next_id = 0;
static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b) static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
@@ -623,7 +620,7 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
if (g_settings.infobar_show_channellogo > 1) if (g_settings.infobar_show_channellogo > 1)
ChannelLogoMode = showChannelLogo(current_channel_id, 0); ChannelLogoMode = showChannelLogo(current_channel_id, 0);
if (ChannelLogoMode == 0 || ChannelLogoMode == 3 || ChannelLogoMode == 4) if (ChannelLogoMode == 0 || ChannelLogoMode == 3 || ChannelLogoMode == 4)
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + OFFSET_INNER_MID, ChanNameY + header_height,BoxEndX - (ChanNameX + 2*OFFSET_INNER_MID) - time_width - LEFT_OFFSET - OFFSET_INNER_MID, ChannelName, COL_INFOBAR_TEXT, 0, renderFlag); g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + OFFSET_INNER_MID, ChanNameY + header_height,BoxEndX - (ChanNameX + 2*OFFSET_INNER_MID) - time_width - OFFSET_INNER_MID, ChannelName, COL_INFOBAR_TEXT, 0, renderFlag);
// show_Data // show_Data
if (CMoviePlayerGui::getInstance().file_prozent > 100) if (CMoviePlayerGui::getInstance().file_prozent > 100)
@@ -889,7 +886,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
fb_pixel_t color = COL_INFOBAR_TEXT; fb_pixel_t color = COL_INFOBAR_TEXT;
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString( g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(
ChanNameX + OFFSET_INNER_MID + ChanNumWidth + OFFSET_INNER_MID, ChanNameY + header_height, ChanNameX + OFFSET_INNER_MID + ChanNumWidth + OFFSET_INNER_MID, ChanNameY + header_height,
BoxEndX - (ChanNameX + 2*OFFSET_INNER_MID) - time_width - LEFT_OFFSET - OFFSET_INNER_MID - ChanNumWidth, BoxEndX - (ChanNameX + 2*OFFSET_INNER_MID) - time_width - OFFSET_INNER_MID - ChanNumWidth,
ChannelName, color /*COL_INFOBAR_TEXT*/, 0, renderFlag); ChannelName, color /*COL_INFOBAR_TEXT*/, 0, renderFlag);
//provider name //provider name
if(g_settings.infobar_show_channeldesc && channel->pname){ if(g_settings.infobar_show_channeldesc && channel->pname){
@@ -906,7 +903,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getDigitOffset()); + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getDigitOffset());
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString( g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(
ChanNameX + OFFSET_INNER_MID + ChanNumWidth + OFFSET_INNER_MID + chname_width, tmpY, ChanNameX + OFFSET_INNER_MID + ChanNumWidth + OFFSET_INNER_MID + chname_width, tmpY,
BoxEndX - (ChanNameX + 2*OFFSET_INNER_MID) - time_width - LEFT_OFFSET - OFFSET_INNER_MID - ChanNumWidth - chname_width, BoxEndX - (ChanNameX + 2*OFFSET_INNER_MID) - time_width - OFFSET_INNER_MID - ChanNumWidth - chname_width,
prov_name, color /*COL_INFOBAR_TEXT*/, 0, renderFlag); prov_name, color /*COL_INFOBAR_TEXT*/, 0, renderFlag);
} }
@@ -2207,7 +2204,7 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c
int logo_x = 0, logo_y = 0; int logo_x = 0, logo_y = 0;
int res = 0; int res = 0;
int start_x = ChanNameX; int start_x = ChanNameX;
int chan_w = BoxEndX - (start_x + 2*OFFSET_INNER_MID) - time_width - LEFT_OFFSET - OFFSET_INNER_MID; int chan_w = BoxEndX - (start_x + 2*OFFSET_INNER_MID) - time_width - OFFSET_INNER_MID;
bool logo_available = g_PicViewer->GetLogoName(logo_channel_id, ChannelName, strAbsIconPath, &logo_w, &logo_h); bool logo_available = g_PicViewer->GetLogoName(logo_channel_id, ChannelName, strAbsIconPath, &logo_w, &logo_h);