livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-2159 Create Vertical Slider to use for zoom in / out controls in view

master
angela 2009-11-23 13:52:40 +08:00
parent 67c832d94b
commit e367e2efc2
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llsliderctrl.cpp
View File

@ -122,7 +122,8 @@ LLSliderCtrl::LLSliderCtrl(const LLSliderCtrl::Params& p)
slider_p.min_value.setIfNotProvided(p.min_value);
slider_p.max_value.setIfNotProvided(p.max_value);
slider_p.increment.setIfNotProvided(p.increment);
slider_p.orientation.setIfNotProvided(p.orientation);
slider_p.commit_callback.function(&LLSliderCtrl::onSliderCommit);
slider_p.control_name(p.control_name);
slider_p.mouse_down_callback( p.mouse_down_callback );

4
indra/llui/llsliderctrl.h
View File

@ -46,6 +46,7 @@ class LLSliderCtrl : public LLF32UICtrl
public:
struct Params : public LLInitParam::Block<Params, LLF32UICtrl::Params>
{
Optional<std::string> orientation;
Optional<S32> label_width;
Optional<S32> text_width;
Optional<bool> show_text;
@ -78,7 +79,8 @@ public:
value_text("value_text"),
slider_label("slider_label"),
mouse_down_callback("mouse_down_callback"),
mouse_up_callback("mouse_up_callback")
mouse_up_callback("mouse_up_callback"),
orientation("orientation", std::string ("horizontal"))
{}
};
protected:

15
indra/newview/skins/default/xui/en/floater_test_slider.xml
View File

@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
can_resize="true"
height="400"
height="500"
layout="topleft"
name="floater_test_slider"
help_topic="floater_test_slider"
@ -84,4 +84,17 @@
name="red_slider"
text_color="red"
text_width="40" />
<slider
width ="140"
bottom="490"
decimal_digits="1"
height="100"
left="20"
label="Red Slider Vertical"
label_width="100"
layout="topleft"
name="red_slider_vertical"
text_color="red"
orientation="vertical"
text_width="20" />
</floater>