* Fix order of colors for some progress bars

This commit is contained in:
Michael Liebmann
2013-04-05 20:37:48 +02:00
parent bd47ef2060
commit adfbfe079c
7 changed files with 10 additions and 1 deletions

View File

@@ -106,12 +106,13 @@ void CVolume::Init()
vbar_w = spacer + icon_w + spacer + progress_w + spacer; vbar_w = spacer + icon_w + spacer + progress_w + spacer;
if (paintDigits) { if (paintDigits) {
digit_w = g_Font[VolumeFont]->getRenderWidth("100"); digit_w = g_Font[VolumeFont]->getRenderWidth("100");
progress_h = std::max(icon_h, digit_h) - 2*pB; progress_h = std::max(icon_h, digit_h);
vbar_w += digit_w; vbar_w += digit_w;
} }
if (volscale) if (volscale)
delete volscale; delete volscale;
volscale = new CProgressBar(progress_x, progress_y, progress_w, progress_h, colFrame, colBar, colShadow, COL_MENUCONTENT_PLUS_3, COL_MENUCONTENT_PLUS_1, true); volscale = new CProgressBar(progress_x, progress_y, progress_w, progress_h, colFrame, colBar, colShadow, COL_MENUCONTENT_PLUS_3, COL_MENUCONTENT_PLUS_1, true);
volscale->setInvert();
// mute icon // mute icon
mute_icon_dx = 0; mute_icon_dx = 0;

View File

@@ -445,6 +445,7 @@ void CDBoxInfoWidget::paint()
CProgressBar pb(x+offsetw, ypos+3, pbw, mheight-10); CProgressBar pb(x+offsetw, ypos+3, pbw, mheight-10);
pb.setFrameThickness(0); pb.setFrameThickness(0);
pb.setBlink(); pb.setBlink();
pb.setInvert();
pb.setValues(percent_used, 100); pb.setValues(percent_used, 100);
pb.paint(false); pb.paint(false);
} }

View File

@@ -232,6 +232,7 @@ void CInfoViewer::changePB()
delete timescale; delete timescale;
timescale = new CProgressBar(); timescale = new CProgressBar();
timescale->setBlink(); timescale->setBlink();
timescale->setRgb(0, 100, 70);
} }
void CInfoViewer::paintTime (bool show_dot, bool firstPaint) void CInfoViewer::paintTime (bool show_dot, bool firstPaint)

View File

@@ -821,12 +821,14 @@ void CInfoViewerBB::changePB()
hddscale = new CProgressBar(); hddscale = new CProgressBar();
hddscale->setFrameThickness(0); hddscale->setFrameThickness(0);
hddscale->setBlink(); hddscale->setBlink();
hddscale->setInvert();
if (sysscale) if (sysscale)
delete sysscale; delete sysscale;
sysscale = new CProgressBar(); sysscale = new CProgressBar();
sysscale->setFrameThickness(0); sysscale->setFrameThickness(0);
sysscale->setBlink(); sysscale->setBlink();
sysscale->setInvert();
} }
void CInfoViewerBB::reset_allScala() void CInfoViewerBB::reset_allScala()

View File

@@ -1288,6 +1288,7 @@ void CMovieBrowser::info_hdd_level(bool paint_hdd)
CProgressBar pb(m_cBoxFrame.iX+ m_cBoxFrameFootRel.iWidth - pbw - border, m_cBoxFrame.iY+m_cBoxFrameTitleRel.iY + border, pbw, m_cBoxFrameTitleRel.iHeight/2); CProgressBar pb(m_cBoxFrame.iX+ m_cBoxFrameFootRel.iWidth - pbw - border, m_cBoxFrame.iY+m_cBoxFrameTitleRel.iY + border, pbw, m_cBoxFrameTitleRel.iHeight/2);
pb.setBlink(); pb.setBlink();
pb.setInvert(); pb.setInvert();
pb.setFrameThickness(0);
pb.setValues( blocks_percent_used, 100); pb.setValues( blocks_percent_used, 100);
pb.paint(false); pb.paint(false);
} }

View File

@@ -122,8 +122,10 @@ int CStreamInfo2::doSignalStrengthLoop ()
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
sigscale = new CProgressBar(/*true, BAR_WIDTH, BAR_HEIGHT*/); sigscale = new CProgressBar(/*true, BAR_WIDTH, BAR_HEIGHT*/);
sigscale->setBlink(); sigscale->setBlink();
sigscale->setFrameThickness(0);
snrscale = new CProgressBar(/*true, BAR_WIDTH, BAR_HEIGHT*/); snrscale = new CProgressBar(/*true, BAR_WIDTH, BAR_HEIGHT*/);
snrscale->setBlink(); snrscale->setBlink();
snrscale->setFrameThickness(0);
lastsnr = lastsig = -1; lastsnr = lastsig = -1;
neutrino_msg_t msg; neutrino_msg_t msg;

View File

@@ -119,6 +119,7 @@ void CTimeOSD::updatePos(short runningPercent)
timescale->setProgress(m_xstart, m_y, BARLEN, m_height -5, runningPercent, 100); timescale->setProgress(m_xstart, m_y, BARLEN, m_height -5, runningPercent, 100);
timescale->setBlink(); timescale->setBlink();
timescale->setRgb(0, 100, 70);
timescale->paint(); timescale->paint();
} }