mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

CInfoViewer: Use flag Font::FULLBG for RenderString()

Browse Source 
dependent on g_settings.theme.infobar_gradient_*
This commit is contained in:
M. Liebmann
2017-01-25 08:50:54 +01:00
parent ea700ddf52
commit a7ef709e55
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/infoviewer.cpp
View File

@@ -601,11 +601,12 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
if (!zap_mode) if (!zap_mode)
infoViewerBB->paintshowButtonBar(); infoViewerBB->paintshowButtonBar();
int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8;
int ChannelLogoMode = 0; int ChannelLogoMode = 0;
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 + 10 , ChanNameY + header_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 ,ChannelName, COL_INFOBAR_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + header_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 ,ChannelName, COL_INFOBAR_TEXT, 0, renderFlag);
// show_Data // show_Data
if (CMoviePlayerGui::getInstance().file_prozent > 100) if (CMoviePlayerGui::getInstance().file_prozent > 100)
@@ -661,7 +662,7 @@ void CInfoViewer::showMovieTitle(const int playState, const t_channel_id &Channe
if (speed) { if (speed) {
int sh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getHeight(); int sh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getHeight();
int sy = BoxStartY + ChanHeight/2 - sh/2 + sh; int sy = BoxStartY + ChanHeight/2 - sh/2 + sh;
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(icon_x, sy, ChanHeight, runningRest, COL_INFOBAR_TEXT); g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(icon_x, sy, ChanHeight, runningRest, COL_INFOBAR_TEXT, 0, renderFlag);
icon_x += speedw; icon_x += speedw;
} }
frameBuffer->paintIcon(playicon, icon_x, icon_y); frameBuffer->paintIcon(playicon, icon_x, icon_y);
@@ -706,6 +707,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
{ {
if(!calledFromNumZap && !(zap_mode & IV_MODE_DEFAULT)) if(!calledFromNumZap && !(zap_mode & IV_MODE_DEFAULT))
resetSwitchMode(); resetSwitchMode();
int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8;
std::string Channel = channel->getName(); std::string Channel = channel->getName();
t_satellite_position satellitePosition = channel->getSatellitePosition(); t_satellite_position satellitePosition = channel->getSatellitePosition();
@@ -816,7 +818,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
} }
} }
int h_sfont = g_SignalFont->getHeight(); int h_sfont = g_SignalFont->getHeight();
g_SignalFont->RenderString (BoxStartX + numbox_offset + ((ChanWidth - satNameWidth) / 2) , numbox->getYPos() + h_sfont, satNameWidth, satname_tmp, COL_INFOBAR_TEXT); g_SignalFont->RenderString (BoxStartX + numbox_offset + ((ChanWidth - satNameWidth) / 2) , numbox->getYPos() + h_sfont, satNameWidth, satname_tmp, COL_INFOBAR_TEXT, 0, renderFlag);
} }
/* TODO: the logic will get much easier once we decouple channellogo and signal bars */ /* TODO: the logic will get much easier once we decouple channellogo and signal bars */
@@ -835,14 +837,14 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
y_tmp, y_tmp,
ChanWidth - 2*numbox_offset, ChanWidth - 2*numbox_offset,
strChanNum, strChanNum,
col_NumBoxText); col_NumBoxText, 0, renderFlag);
} }
if (ChannelLogoMode == 1 || ( g_settings.infobar_show_channellogo == 3 && !logo_ok) || g_settings.infobar_show_channellogo == 6 ) /* channel number besides channel name */ if (ChannelLogoMode == 1 || ( g_settings.infobar_show_channellogo == 3 && !logo_ok) || g_settings.infobar_show_channellogo == 6 ) /* channel number besides channel name */
{ {
ChanNumWidth = 5 + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth (strChanNum); ChanNumWidth = 5 + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth (strChanNum);
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString( g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(
ChanNameX + 5, ChanNameY + header_height, ChanNameX + 5, ChanNameY + header_height,
ChanNumWidth, strChanNum, col_NumBoxText); ChanNumWidth, strChanNum, col_NumBoxText, 0, renderFlag);
} }
} }
@@ -854,7 +856,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString( g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(
ChanNameX + 10 + ChanNumWidth, ChanNameY + header_height, ChanNameX + 10 + ChanNumWidth, ChanNameY + header_height,
BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 - ChanNumWidth, BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 - ChanNumWidth,
ChannelName, color /*COL_INFOBAR_TEXT*/); 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){
std::string prov_name = channel->pname; std::string prov_name = channel->pname;
@@ -871,7 +873,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString( g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(
ChanNameX + 10 + ChanNumWidth + chname_width, tmpY, ChanNameX + 10 + ChanNumWidth + chname_width, tmpY,
BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 - ChanNumWidth - chname_width, BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 10 - ChanNumWidth - chname_width,
prov_name, color /*COL_INFOBAR_TEXT*/); prov_name, color /*COL_INFOBAR_TEXT*/, 0, renderFlag);
} }
} }
@@ -1635,6 +1637,7 @@ void CInfoViewer::showSNR ()
{ {
if (! is_visible) if (! is_visible)
return; return;
int renderFlag = ((g_settings.theme.infobar_gradient_top) ? Font::FULLBG : 0) | Font::IS_UTF8;
/* right now, infobar_show_channellogo == 3 is the trigger for signal bars etc. /* right now, infobar_show_channellogo == 3 is the trigger for signal bars etc.
TODO: decouple this */ TODO: decouple this */
if (!fileplay && !IS_WEBTV(current_channel_id) && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 )) { if (!fileplay && !IS_WEBTV(current_channel_id) && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 )) {
@@ -1657,7 +1660,7 @@ void CInfoViewer::showSNR ()
int freqWidth = g_SignalFont->getRenderWidth(freq); int freqWidth = g_SignalFont->getRenderWidth(freq);
if (freqWidth > (ChanWidth - numbox_offset*2)) if (freqWidth > (ChanWidth - numbox_offset*2))
freqWidth = ChanWidth - numbox_offset*2; freqWidth = ChanWidth - numbox_offset*2;
g_SignalFont->RenderString(BoxStartX + numbox_offset + ((ChanWidth - freqWidth) / 2), y_numbox + y_freq - 3, ChanWidth - 2*numbox_offset, freq, SDT_freq_update ? COL_COLORED_EVENTS_TEXT:COL_INFOBAR_TEXT); g_SignalFont->RenderString(BoxStartX + numbox_offset + ((ChanWidth - freqWidth) / 2), y_numbox + y_freq - 3, ChanWidth - 2*numbox_offset, freq, SDT_freq_update ? COL_COLORED_EVENTS_TEXT:COL_INFOBAR_TEXT, 0, renderFlag);
SDT_freq_update = false; SDT_freq_update = false;
} }
if (sigbox == NULL){ if (sigbox == NULL){