diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-07 17:27:24 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-07 17:27:24 +0100 |
| commit | 770baa28526cf4d860cdea6d97fa9f089a5941c7 (patch) | |
| tree | f8c0b372fbee3957d8a6fbb760a923591e79e531 /indra/llui/llmultislider.h | |
| parent | 4bd2b8b98ba1c562dfd65975a87ef5ee3db35633 (diff) | |
| parent | df96fc652b452dbc9bd2daa7398ada1feb235fff (diff) | |
Merge
Diffstat (limited to 'indra/llui/llmultislider.h')
| -rw-r--r-- | indra/llui/llmultislider.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h index eff0c7d2d7..3884b0a2a0 100644 --- a/indra/llui/llmultislider.h +++ b/indra/llui/llmultislider.h @@ -60,6 +60,8 @@ public: thumb_center_selected_color, triangle_color; + Optional<std::string> orientation; + Optional<CommitCallbackParam> mouse_down_callback, mouse_up_callback; Optional<S32> thumb_width; @@ -75,7 +77,7 @@ public: virtual ~LLMultiSlider(); void setSliderValue(const std::string& name, F32 value, BOOL from_event = FALSE); F32 getSliderValue(const std::string& name) const; - F32 getSliderValueFromX(S32 xpos) const; + F32 getSliderValueFromPos(S32 xpos, S32 ypos) const; const std::string& getCurSlider() const { return mCurSlider; } F32 getCurSliderValue() const { return getSliderValue(mCurSlider); } @@ -127,7 +129,9 @@ protected: LLUIColor mThumbCenterSelectedColor; LLUIColor mDisabledThumbColor; LLUIColor mTriangleColor; - + + const EOrientation mOrientation; + commit_signal_t* mMouseDownSignal; commit_signal_t* mMouseUpSignal; }; |