Progressbars: use default frame thickness

It's unnecessary overhead to set the value everywhere, except it's needed.
This commit is contained in:
2013-04-05 21:28:46 +02:00
parent 210ae1491d
commit f70a30defa
7 changed files with 6 additions and 13 deletions

View File

@@ -113,6 +113,7 @@ void CVolume::Init()
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(); volscale->setInvert();
volscale->setFrameThickness(2);
// mute icon // mute icon
mute_icon_dx = 0; mute_icon_dx = 0;

View File

@@ -443,7 +443,6 @@ void CDBoxInfoWidget::paint()
if (pbw > 8) /* smaller progressbar is not useful ;) */ if (pbw > 8) /* smaller progressbar is not useful ;) */
{ {
CProgressBar pb(x+offsetw, ypos+3, pbw, mheight-10); CProgressBar pb(x+offsetw, ypos+3, pbw, mheight-10);
pb.setFrameThickness(0);
pb.setBlink(); pb.setBlink();
pb.setInvert(); pb.setInvert();
pb.setValues(percent_used, 100); pb.setValues(percent_used, 100);

View File

@@ -642,7 +642,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
{ {
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1); int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
CProgressBar pb(pbx, sy+oy-height, 104, height-6); CProgressBar pb(pbx, sy+oy-height, 104, height-6);
pb.setFrameThickness(0);
pb.setBlink(); pb.setBlink();
pb.setValues(epg_done, 100); pb.setValues(epg_done, 100);
pb.paint(false); pb.paint(false);
@@ -688,7 +687,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if ( epg_done!= -1 ) { if ( epg_done!= -1 ) {
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1); int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
CProgressBar pb(pbx, sy+oy-height, 104, height-6); CProgressBar pb(pbx, sy+oy-height, 104, height-6);
pb.setFrameThickness(0);
pb.setBlink(); pb.setBlink();
pb.setValues(epg_done, 100); pb.setValues(epg_done, 100);
pb.paint(false); pb.paint(false);

View File

@@ -220,13 +220,11 @@ void CInfoViewer::changePB()
delete sigscale; delete sigscale;
sigscale = new CProgressBar(); sigscale = new CProgressBar();
sigscale->setBlink(); sigscale->setBlink();
sigscale->setFrameThickness(0);
if (snrscale) if (snrscale)
delete snrscale; delete snrscale;
snrscale = new CProgressBar(); snrscale = new CProgressBar();
snrscale->setBlink(); snrscale->setBlink();
snrscale->setFrameThickness(0);
if (timescale) if (timescale)
delete timescale; delete timescale;
@@ -1479,7 +1477,6 @@ void CInfoViewer::display_Info(const char *current, const char *next,
pb_w = BoxEndX - 10 - xStart; pb_w = BoxEndX - 10 - xStart;
pb_shadow = 0; pb_shadow = 0;
timescale->setShadowOnOff(false); timescale->setShadowOnOff(false);
timescale->setFrameThickness(0);
} }
switch(g_settings.infobar_progressbar) //set progressbar position switch(g_settings.infobar_progressbar) //set progressbar position
{ {

View File

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

View File

@@ -1288,7 +1288,6 @@ 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

@@ -120,12 +120,13 @@ int CStreamInfo2::doSignalStrengthLoop ()
#define BAR_WIDTH 150 #define BAR_WIDTH 150
#define BAR_HEIGHT 12 #define BAR_HEIGHT 12
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
sigscale = new CProgressBar(/*true, BAR_WIDTH, BAR_HEIGHT*/);
sigscale = new CProgressBar();
sigscale->setBlink(); sigscale->setBlink();
sigscale->setFrameThickness(0);
snrscale = new CProgressBar(/*true, BAR_WIDTH, BAR_HEIGHT*/); snrscale = new CProgressBar();
snrscale->setBlink(); snrscale->setBlink();
snrscale->setFrameThickness(0);
lastsnr = lastsig = -1; lastsnr = lastsig = -1;
neutrino_msg_t msg; neutrino_msg_t msg;