summaryrefslogtreecommitdiff
path: root/indra/llui/llmultisliderctrl.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-09-06 21:29:28 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-09-06 21:29:28 +0300
commite539236a75a163b1c6748617bd1e4d2b84aaa3d6 (patch)
treeb1ac6d1694d25aa5c4abe8d2e42b1fdbd255559a /indra/llui/llmultisliderctrl.h
parent14107dd0625af06dcf2019940eaf8e8d66585658 (diff)
MAINT-9099 Implementation of vertical orientation support for multislider
Diffstat (limited to 'indra/llui/llmultisliderctrl.h')
-rw-r--r--indra/llui/llmultisliderctrl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llmultisliderctrl.h b/indra/llui/llmultisliderctrl.h
index 0ce21c0612..a1593c28e0 100644
--- a/indra/llui/llmultisliderctrl.h
+++ b/indra/llui/llmultisliderctrl.h
@@ -58,6 +58,8 @@ public:
draw_track,
use_triangle;
+ Optional<std::string> orientation;
+
Optional<F32> overlap_threshold;
Optional<LLUIColor> text_color,
@@ -102,7 +104,7 @@ public:
void setMaxValue(F32 max_value) {mMultiSlider->setMaxValue(max_value);}
void setIncrement(F32 increment) {mMultiSlider->setIncrement(increment);}
- F32 getSliderValueFromX(S32 x) const { return mMultiSlider->getSliderValueFromX(x); }
+ F32 getSliderValueFromPos(S32 x, S32 y) const { return mMultiSlider->getSliderValueFromPos(x, y); }
/// for adding and deleting sliders
const std::string& addSlider();