streaminfo: align background color; thx to max_10

Origin commit data
------------------
Commit: 9b2aec781c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)

Origin message was:
------------------
- streaminfo: align background color; thx to max_10
This commit is contained in:
vanhofen
2015-12-15 12:05:53 +01:00
parent e6aafda6fd
commit 60ba7ef468

View File

@@ -185,7 +185,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
g_Font[font_info]->RenderString(dx1 , average_bitrate_pos, offset+10, tmp_str, COL_INFOBAR_TEXT);
sprintf(currate, "%5llu.%02llu", rate.short_average / 1000ULL, rate.short_average % 1000ULL);
frameBuffer->paintBoxRel (dx1 + average_bitrate_offset , average_bitrate_pos -dheight, sw, dheight, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel (dx1 + average_bitrate_offset , average_bitrate_pos -dheight, sw, dheight, COL_MENUCONTENT_PLUS_0);
g_Font[font_info]->RenderString (dx1 + average_bitrate_offset , average_bitrate_pos, sw - 10, currate, COL_INFOBAR_TEXT);
@@ -429,7 +429,7 @@ void CStreamInfo2::SignalRenderStr(unsigned int value, int _x, int _y)
char str[30];
int fw = g_Font[font_small]->getWidth();
fw *=(fw>17)?5:6;
frameBuffer->paintBoxRel(_x, _y - sheight + 5, fw, sheight -1, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel(_x, _y - sheight + 5, fw, sheight -1, COL_MENUCONTENT_PLUS_0);
sprintf(str,"%6u",value);
g_Font[font_small]->RenderString(_x, _y + 5, fw, str, COL_INFOBAR_TEXT);
}
@@ -458,7 +458,7 @@ void CStreamInfo2::paint (int /*mode*/)
CVFD::getInstance ()->setMode (CVFD::MODE_MENU_UTF8, head_string);
// paint backround, title pig, etc.
frameBuffer->paintBoxRel (0, 0, max_width, max_height, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel (0, 0, max_width, max_height, COL_MENUCONTENT_PLUS_0);
g_Font[font_head]->RenderString (xpos, ypos + hheight + 1, width, head_string, COL_MENUHEAD_TEXT);
ypos += hheight;
@@ -471,7 +471,7 @@ void CStreamInfo2::paint (int /*mode*/)
} else {
// -- small PIG, small signal graph
// -- paint backround, title pig, etc.
frameBuffer->paintBoxRel (0, 0, max_width, max_height, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel (0, 0, max_width, max_height, COL_MENUCONTENT_PLUS_0);
// -- paint large signal graph
paint_signal_fe_box (x, y, width, height-100);
@@ -489,7 +489,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
yypos = ypos;
if(box_h > 0)
frameBuffer->paintBoxRel (0, ypos, box_width, box_h, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel (0, ypos, box_width, box_h, COL_MENUCONTENT_PLUS_0);
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
if(!channel)
@@ -762,7 +762,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
unsigned short i;
int box_width = width*2/3-10;
if (box_h2 > ypos+(iheight*2))
frameBuffer->paintBox(0, ypos+(iheight*2), box_width, box_h2, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBox(0, ypos+(iheight*2), box_width, box_h2, COL_MENUCONTENT_PLUS_0);
std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
bool caids[NUM_CAIDS];
@@ -997,7 +997,7 @@ void CStreamInfo2::showSNR ()
if (signalbox == NULL)
{
signalbox = new CSignalBox(x + 10, yypos, 240, 50, frontend);
signalbox->setColorBody(COL_MENUHEAD_PLUS_0);
signalbox->setColorBody(COL_MENUCONTENT_PLUS_0);
signalbox->setTextColor(COL_INFOBAR_TEXT);
signalbox->doPaintBg(true);
}