Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mass fixup to appearance mode ui overhead!

Browse Source 
Should contain no functional changes, ust that all ui in appearance mode is now cached instead of calling getChild per frame.
Switches from hiding min/max param text every frame to force-drawing in draw call and setting invisible (llscrollingpanelparam.cpp/the corresponding xml)
Cleans up some old commented out code.
Moves some simple, one-call functions into their calling bodies.
Also, for some reason I had to adjust the alpha checkboxes, totally confused why they were out of line... maybe they had been already? I don't see a changed line that did positioning.

Contains spaces to tabs fixes, please view without space changes (You have been warned!)
This commit is contained in:
Inusaito Sayori
2014-06-05 21:41:59 -04:00
parent d23632ef46
commit f6db6058e1
10 changed files with 648 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
indra/newview/llscrollingpanelparam.cpp
View File

@@ -77,10 +77,6 @@ LLScrollingPanelParam::LLScrollingPanelParam( const std::string& name,
mHintMin->setAllowsUpdates( FALSE );
mHintMax->setAllowsUpdates( FALSE );
std::string min_name = LLTrans::getString(param->getMinDisplayName());
std::string max_name = LLTrans::getString(param->getMaxDisplayName());
childSetValue("min param text", min_name);
childSetValue("max param text", max_name);
mLess = getChild<LLButton>("less");
mLess->setMouseDownCallback( boost::bind(&LLScrollingPanelParam::onHintMouseDown, this, false) );
mLess->setMouseUpCallback( boost::bind(&LLScrollingPanelParam::onHintMouseUp, this, false) );
@@ -93,6 +89,10 @@ LLScrollingPanelParam::LLScrollingPanelParam( const std::string& name,
mMore->setHeldDownCallback( boost::bind(&LLScrollingPanelParam::onHintHeldDown, this, true) );
mMore->setHeldDownDelay( PARAM_STEP_TIME_THRESHOLD );
}
mMinText = getChildView("min param text");
mMinText->setValue(LLTrans::getString(param->getMinDisplayName()));
mMaxText = getChildView("max param text");
mMaxText->setValue(LLTrans::getString(param->getMaxDisplayName()));
setVisible(FALSE);
setBorderVisible( FALSE );
@@ -157,9 +157,6 @@ void LLScrollingPanelParam::draw()
if(mMore)
mMore->setVisible(mHintMax && mHintMax->getVisible());
// Draw all the children except for the labels
childSetVisible( "min param text", FALSE );
childSetVisible( "max param text", FALSE );
LLPanel::draw();
// Draw the hints over the "less" and "more" buttons.
@@ -191,23 +188,8 @@ void LLScrollingPanelParam::draw()
// Draw labels on top of the buttons
childSetVisible( "min param text", TRUE );
drawChild(getChild<LLView>("min param text"), BTN_BORDER, BTN_BORDER);
childSetVisible( "max param text", TRUE );
drawChild(getChild<LLView>("max param text"), BTN_BORDER, BTN_BORDER);
}
// static
void LLScrollingPanelParam::onSliderMouseDown(LLUICtrl* ctrl, void* userdata)
{
}
// static
void LLScrollingPanelParam::onSliderMouseUp(LLUICtrl* ctrl, void* userdata)
{
LLScrollingPanelParam* self = (LLScrollingPanelParam*) userdata;
LLVisualParamHint::requestHintUpdates( self->mHintMin, self->mHintMax );
drawChild(mMinText, BTN_BORDER, BTN_BORDER, true);
drawChild(mMaxText, BTN_BORDER, BTN_BORDER, true);
}
void LLScrollingPanelParam::onHintMouseDown( bool max )
@@ -262,17 +244,16 @@ void LLScrollingPanelParam::onHintHeldDown( bool max )
// Make sure we're not taking the slider out of bounds
// (this is where some simple UI limits are stored)
F32 new_percent = weightToPercent(new_weight);
LLSliderCtrl* slider = getChild<LLSliderCtrl>("param slider");
if (slider)
if (mSlider)
{
if (slider->getMinValue() < new_percent
&& new_percent < slider->getMaxValue())
if (mSlider->getMinValue() < new_percent
&& new_percent < mSlider->getMaxValue())
{
mWearable->setVisualParamWeight(param->getID(), new_weight, FALSE);
mWearable->writeToAvatar(gAgentAvatarp);
gAgentAvatarp->updateVisualParams();
slider->setValue( weightToPercent( new_weight ) );
mSlider->setValue( weightToPercent( new_weight ) );
}
}
}
@@ -301,15 +282,14 @@ void LLScrollingPanelParam::onHintMouseUp( bool max )
// step a fraction in the negative direction
F32 new_weight = current_weight + (range / 10.f);
F32 new_percent = weightToPercent(new_weight);
LLSliderCtrl* slider = getChild<LLSliderCtrl>("param slider");
if (slider)
if (mSlider)
{
if (slider->getMinValue() < new_percent
&& new_percent < slider->getMaxValue())
if (mSlider->getMinValue() < new_percent
&& new_percent < mSlider->getMaxValue())
{
mWearable->setVisualParamWeight(param->getID(), new_weight, FALSE);
mWearable->writeToAvatar(gAgentAvatarp);
slider->setValue( weightToPercent( new_weight ) );
mSlider->setValue( weightToPercent( new_weight ) );
}
}
}