From e61d7ac0098d89cc6b124dda2e040120c01d2bee Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 10 Jul 2018 17:09:47 +0300 Subject: MAINT-8833 EEP UI should be either responsive or indicate that it is disabled. --- indra/llui/llslider.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llui/llslider.cpp') diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp index ebbb951ee6..6925c0a130 100644 --- a/indra/llui/llslider.cpp +++ b/indra/llui/llslider.cpp @@ -331,8 +331,9 @@ void LLSlider::draw() highlight_rect.set(track_rect.mLeft, track_rect.mTop, track_rect.mRight, track_rect.mBottom); } - trackImage->draw(track_rect, LLColor4::white % alpha); - trackHighlightImage->draw(highlight_rect, LLColor4::white % alpha); + LLColor4 color = isInEnabledChain() ? LLColor4::white % alpha : LLColor4::white % (0.6f * alpha); + trackImage->draw(track_rect, color); + trackHighlightImage->draw(highlight_rect, color); // Thumb if (hasFocus()) -- cgit v1.2.3 From b030d7036f87d30babb4a8df8d256113f46182e9 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 5 Oct 2018 19:31:35 +0300 Subject: SL-1961 EEP correct disabling of altitude multislider and cleanup --- indra/llui/llslider.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/llui/llslider.cpp') diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp index 6925c0a130..62df5a2c38 100644 --- a/indra/llui/llslider.cpp +++ b/indra/llui/llslider.cpp @@ -42,7 +42,6 @@ static LLDefaultChildRegistry::Register 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), -- cgit v1.2.3