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

SL-12591 Fixed slider value comparison

master
Andrey Kleshchev 2020-02-25 18:59:43 +02:00
parent d16a79fc4c
commit db2c32285b
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llui/llmultislider.cpp
View File

@ -149,6 +149,16 @@ LLMultiSlider::~LLMultiSlider()
delete mMouseUpSignal;
}
F32 LLMultiSlider::getNearestIncrement(F32 value) const
{
value = llclamp(value, mMinValue, mMaxValue);
// Round to nearest increment (bias towards rounding down)
value -= mMinValue;
value += mIncrement / 2.0001f;
value -= fmod(value, mIncrement);
return mMinValue + value;
}
void LLMultiSlider::setSliderValue(const std::string& name, F32 value, BOOL from_event)
{
@ -157,13 +167,7 @@ void LLMultiSlider::setSliderValue(const std::string& name, F32 value, BOOL from
return;
}
value = llclamp( value, mMinValue, mMaxValue );
// Round to nearest increment (bias towards rounding down)
value -= mMinValue;
value += mIncrement/2.0001f;
value -= fmod(value, mIncrement);
F32 newValue = mMinValue + value;
F32 newValue = getNearestIncrement(value);
// now, make sure no overlap
// if we want that

4
indra/llui/llmultislider.h
View File

@ -77,6 +77,10 @@ protected:
friend class LLUICtrlFactory;
public:
virtual ~LLMultiSlider();
// Multi-slider rounds values to nearest increments (bias towards rounding down)
F32 getNearestIncrement(F32 value) const;
void setSliderValue(const std::string& name, F32 value, BOOL from_event = FALSE);
F32 getSliderValue(const std::string& name) const;
F32 getSliderValueFromPos(S32 xpos, S32 ypos) const;

1
indra/llui/llmultisliderctrl.h
View File

@ -107,6 +107,7 @@ public:
void setMaxValue(F32 max_value) {mMultiSlider->setMaxValue(max_value);}
void setIncrement(F32 increment) {mMultiSlider->setIncrement(increment);}
F32 getNearestIncrement(F32 value) const { return mMultiSlider->getNearestIncrement(value); }
F32 getSliderValueFromPos(S32 x, S32 y) const { return mMultiSlider->getSliderValueFromPos(x, y); }
LLRect getSliderThumbRect(const std::string &name) const { return mMultiSlider->getSliderThumbRect(name); }

9
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -991,13 +991,20 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
}
else
{
if (mEditDay->moveTrackKeyframe(mCurrentTrack, (*it).second.mFrame, sliderpos) && mCanMod)
// slider rounds values to nearest increments, changes can be substanntial (half increment)
if (abs(mFramesSlider->getNearestIncrement((*it).second.mFrame) - sliderpos) < F_APPROXIMATELY_ZERO)
{
// same value
mFramesSlider->setCurSliderValue((*it).second.mFrame);
}
else if (mEditDay->moveTrackKeyframe(mCurrentTrack, (*it).second.mFrame, sliderpos) && mCanMod)
{
(*it).second.mFrame = sliderpos;
setDirtyFlag();
}
else
{
// same value, wrong track, no such value, no mod
mFramesSlider->setCurSliderValue((*it).second.mFrame);
}