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

SL-1961 EEP correct disabling of altitude multislider and cleanup

master
andreykproductengine 2018-10-05 19:31:35 +03:00
parent 931ff63019
commit b030d7036f
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llui/llmultislider.cpp
View File

@ -731,7 +731,14 @@ void LLMultiSlider::draw()
// the draw command
if (mThumbImagep)
{
mThumbImagep->draw(mIt->second);
if (getEnabled())
{
mThumbImagep->draw(mIt->second);
}
else
{
mThumbImagep->draw(mIt->second, LLColor4::grey % 0.8f);
}
}
else if (capture == this)
{
@ -748,7 +755,14 @@ void LLMultiSlider::draw()
{
if (mThumbImagep)
{
mThumbImagep->draw(curSldrIt->second);
if (getEnabled())
{
mThumbImagep->draw(curSldrIt->second);
}
else
{
mThumbImagep->draw(curSldrIt->second, LLColor4::grey % 0.8f);
}
}
else if (capture == this)
{

2
indra/llui/llslider.cpp
View File

@ -42,7 +42,6 @@ static LLDefaultChildRegistry::Register<LLSlider> r1("slider_bar");
LLSlider::Params::Params()
: orientation ("orientation", std::string ("horizontal")),
track_color("track_color"),
thumb_outline_color("thumb_outline_color"),
thumb_center_color("thumb_center_color"),
thumb_image("thumb_image"),
@ -60,7 +59,6 @@ LLSlider::LLSlider(const LLSlider::Params& p)
: LLF32UICtrl(p),
mMouseOffset( 0 ),
mOrientation ((p.orientation() == "horizontal") ? HORIZONTAL : VERTICAL),
mTrackColor(p.track_color()),
mThumbOutlineColor(p.thumb_outline_color()),
mThumbCenterColor(p.thumb_center_color()),
mThumbImage(p.thumb_image),

4
indra/llui/llslider.h
View File

@ -38,8 +38,7 @@ public:
{
Optional<std::string> orientation;
Optional<LLUIColor> track_color,
thumb_outline_color,
Optional<LLUIColor> thumb_outline_color,
thumb_center_color;
Optional<LLUIImage*> thumb_image,
@ -99,7 +98,6 @@ private:
const EOrientation mOrientation;
LLRect mThumbRect;
LLUIColor mTrackColor;
LLUIColor mThumbOutlineColor;
LLUIColor mThumbCenterColor;

2
indra/newview/llpanelenvironment.cpp
View File

@ -388,6 +388,8 @@ bool LLPanelEnvironmentInfo::setControlsEnabled(bool enabled)
getChild<LLUICtrl>(BTN_EDIT)->setEnabled(enabled);
getChild<LLUICtrl>(SLD_DAYLENGTH)->setEnabled(enabled && (rdo_selection != 0) && !is_legacy);
getChild<LLUICtrl>(SLD_DAYOFFSET)->setEnabled(enabled && (rdo_selection != 0) && !is_legacy);
getChild<LLUICtrl>(SLD_ALTITUDES)->setEnabled(enabled && isRegion() && !is_legacy);
getChild<LLUICtrl>(ICN_GROUND)->setColor((enabled && isRegion() && !is_legacy) ? LLColor4::white : LLColor4::grey % 0.8f);
getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setEnabled(enabled && isRegion() && !is_legacy);
getChild<LLUICtrl>(CHK_ALLOWOVERRIDE)->setEnabled(enabled && isRegion() && !is_legacy);
getChild<LLUICtrl>(BTN_APPLY)->setEnabled(enabled && (mDirtyFlag != 0));