Merged in andreykproductengine/maint-eep (pull request #254)

SL-1531 Hover highlight should be consistent with mouse selection
meow-7.2.2
Rider Linden 2019-02-01 16:43:46 +00:00
commit 45e291bfdf
1 changed files with 6 additions and 9 deletions

View File

@ -507,17 +507,14 @@ BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask)
{
if (getEnabled())
{
if (mHoverSlider.empty() || !getSliderThumbRect(mHoverSlider).pointInRect(x, y))
mHoverSlider.clear();
std::map<std::string, LLRect>::iterator mIt = mThumbRects.begin();
for (; mIt != mThumbRects.end(); mIt++)
{
mHoverSlider.clear();
std::map<std::string, LLRect>::iterator mIt = mThumbRects.begin();
for (; mIt != mThumbRects.end(); mIt++)
if (mIt->second.pointInRect(x, y))
{
if (mIt->second.pointInRect(x, y))
{
mHoverSlider = mIt->first;
break;
}
mHoverSlider = mIt->first;
break;
}
}
}