From b7a1b499fd03bd6bfaef37dbdaa9db734dc293b5 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 1 Feb 2019 15:03:02 +0200
Subject: SL-1531 Hover highlight should be consistent with mouse selection
---
indra/llui/llmultislider.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
(limited to 'indra')
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;
}
}
}
--
cgit v1.2.3