diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-02-01 15:03:02 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-02-01 15:03:02 +0200 |
| commit | b7a1b499fd03bd6bfaef37dbdaa9db734dc293b5 (patch) | |
| tree | 7b697702e712a282d91d85d0adeb696b7b157640 /indra | |
| parent | 2456715a407cc11f3e0077cb3c54e21188e6ec86 (diff) | |
SL-1531 Hover highlight should be consistent with mouse selection
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llmultislider.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index b8f0a01b86..fbe0d3f065 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -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; } } } |