livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement fade-out for llprogressbar, fix problem where setTopCtrl was being called 

Review #47
master
Rick Pasetto 2009-11-25 14:39:05 -08:00
parent 751a904982
commit 3efbd20980
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llui/llprogressbar.cpp
View File

@ -72,12 +72,13 @@ LLProgressBar::~LLProgressBar()
void LLProgressBar::draw()
{
static LLTimer timer;
LLUIImagePtr bar_fg_imagep = LLUI::getUIImage("progressbar_fill.tga");
F32 alpha = getDrawContext().mAlpha;
mImageBar->draw(getLocalRect(), mColorBackground.get());
LLColor4 image_bar_color = mColorBackground.get();
image_bar_color.setAlpha(alpha);
mImageBar->draw(getLocalRect(), image_bar_color);
F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
alpha *= 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
LLColor4 bar_color = mColorBar.get();
bar_color.mV[VALPHA] *= alpha; // modulate alpha
LLRect progress_rect = getLocalRect();

4
indra/newview/llpanelprimmediacontrols.cpp
View File

@ -503,12 +503,10 @@ void LLPanelPrimMediaControls::updateShape()
{
mMediaProgressPanel->setVisible(true);
mMediaProgressBar->setPercent(media_plugin->getProgressPercent());
gFocusMgr.setTopCtrl(mMediaProgressPanel);
}
else if (mMediaProgressPanel->getVisible())
else
{
mMediaProgressPanel->setVisible(false);
gFocusMgr.setTopCtrl(NULL);
}
}