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

MAINT-9099 Implementation of vertical orientation support for multislider

master
andreykproductengine 2018-09-06 21:29:28 +03:00
parent 14107dd062
commit e539236a75
5 changed files with 91 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
indra/llui/llmultislider.cpp
View File

@ -55,6 +55,7 @@ LLMultiSlider::Params::Params()
: max_sliders("max_sliders", 1),
allow_overlap("allow_overlap", false),
loop_overlap("loop_overlap", false),
orientation("orientation"),
overlap_threshold("overlap_threshold", 0),
draw_track("draw_track", true),
use_triangle("use_triangle", false),
@ -86,6 +87,7 @@ LLMultiSlider::LLMultiSlider(const LLMultiSlider::Params& p)
mDisabledThumbColor(p.thumb_disabled_color()),
mTriangleColor(p.triangle_color()),
mThumbWidth(p.thumb_width),
mOrientation((p.orientation() == "vertical") ? VERTICAL : HORIZONTAL),
mMouseDownSignal(NULL),
mMouseUpSignal(NULL)
{
@ -204,13 +206,26 @@ void LLMultiSlider::setSliderValue(const std::string& name, F32 value, BOOL from
}
F32 t = (newValue - mMinValue) / (mMaxValue - mMinValue);
if (mOrientation == HORIZONTAL)
{
S32 left_edge = mThumbWidth/2;
S32 right_edge = getRect().getWidth() - (mThumbWidth/2);
S32 left_edge = mThumbWidth/2;
S32 right_edge = getRect().getWidth() - (mThumbWidth/2);
S32 x = left_edge + S32( t * (right_edge - left_edge) );
S32 x = left_edge + S32( t * (right_edge - left_edge) );
mThumbRects[name].mLeft = x - (mThumbWidth/2);
mThumbRects[name].mRight = x + (mThumbWidth/2);
mThumbRects[name].mLeft = x - (mThumbWidth / 2);
mThumbRects[name].mRight = x + (mThumbWidth / 2);
}
else
{
S32 bottom_edge = mThumbWidth/2;
S32 top_edge = getRect().getHeight() - (mThumbWidth/2);
S32 x = bottom_edge + S32( t * (top_edge - bottom_edge) );
mThumbRects[name].mTop = x + (mThumbWidth / 2);
mThumbRects[name].mBottom = x - (mThumbWidth / 2);
}
}
void LLMultiSlider::setValue(const LLSD& value)
@ -244,15 +259,29 @@ void LLMultiSlider::setCurSlider(const std::string& name)
}
}
F32 LLMultiSlider::getSliderValueFromX(S32 xpos) const
F32 LLMultiSlider::getSliderValueFromPos(S32 xpos, S32 ypos) const
{
S32 left_edge = mThumbWidth / 2;
S32 right_edge = getRect().getWidth() - (mThumbWidth / 2);
F32 t = 0;
if (mOrientation == HORIZONTAL)
{
S32 left_edge = mThumbWidth / 2;
S32 right_edge = getRect().getWidth() - (mThumbWidth / 2);
xpos += mMouseOffset;
xpos = llclamp(xpos, left_edge, right_edge);
xpos += mMouseOffset;
xpos = llclamp(xpos, left_edge, right_edge);
F32 t = F32(xpos - left_edge) / (right_edge - left_edge);
t = F32(xpos - left_edge) / (right_edge - left_edge);
}
else
{
S32 bottom_edge = mThumbWidth / 2;
S32 top_edge = getRect().getHeight() - (mThumbWidth / 2);
ypos += mMouseOffset;
ypos = llclamp(ypos, bottom_edge, top_edge);
t = F32(ypos - bottom_edge) / (top_edge - bottom_edge);
}
return((t * (mMaxValue - mMinValue)) + mMinValue);
}
@ -286,7 +315,14 @@ const std::string& LLMultiSlider::addSlider(F32 val)
}
// add a new thumb rect
mThumbRects[newName.str()] = LLRect( 0, getRect().getHeight(), mThumbWidth, 0 );
if (mOrientation == HORIZONTAL)
{
mThumbRects[newName.str()] = LLRect(0, getRect().getHeight(), mThumbWidth, 0);
}
else
{
mThumbRects[newName.str()] = LLRect(0, mThumbWidth, getRect().getWidth(), 0);
}
// add the value and set the current slider to this one
mValue.insert(newName.str(), initVal);
@ -312,7 +348,14 @@ void LLMultiSlider::addSlider(F32 val, const std::string& name)
}
// add a new thumb rect
mThumbRects[name] = LLRect( 0, getRect().getHeight(), mThumbWidth, 0 );
if (mOrientation == HORIZONTAL)
{
mThumbRects[name] = LLRect(0, getRect().getHeight(), mThumbWidth, 0);
}
else
{
mThumbRects[name] = LLRect(0, mThumbWidth, getRect().getWidth(), 0);
}
// add the value and set the current slider to this one
mValue.insert(name, initVal);
@ -416,7 +459,7 @@ BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask)
//
// F32 t = F32(x - left_edge) / (right_edge - left_edge);
// setCurSliderValue(t * (mMaxValue - mMinValue) + mMinValue );
setCurSliderValue(getSliderValueFromX(x));
setCurSliderValue(getSliderValueFromPos(x, y));
onCommit();
getWindow()->setCursor(UI_CURSOR_ARROW);
@ -485,7 +528,14 @@ BOOL LLMultiSlider::handleMouseDown(S32 x, S32 y, MASK mask)
// Find the offset of the actual mouse location from the center of the thumb.
if (mThumbRects[mCurSlider].pointInRect(x,y))
{
mMouseOffset = (mThumbRects[mCurSlider].mLeft + mThumbWidth/2) - x;
if (mOrientation == HORIZONTAL)
{
mMouseOffset = (mThumbRects[mCurSlider].mLeft + mThumbWidth / 2) - x;
}
else
{
mMouseOffset = (mThumbRects[mCurSlider].mBottom + mThumbWidth / 2) - y;
}
}
else
{
@ -550,9 +600,18 @@ void LLMultiSlider::draw()
// Track
LLUIImagePtr thumb_imagep = LLUI::getUIImage("Rounded_Square");
static LLUICachedControl<S32> multi_track_height ("UIMultiTrackHeight", 0);
S32 height_offset = (getRect().getHeight() - multi_track_height) / 2;
LLRect track_rect(0, getRect().getHeight() - height_offset, getRect().getWidth(), height_offset );
static LLUICachedControl<S32> multi_track_height_width ("UIMultiTrackHeight", 0);
S32 height_offset = 0;
S32 width_offset = 0;
if (mOrientation == HORIZONTAL)
{
height_offset = (getRect().getHeight() - multi_track_height_width) / 2;
}
else
{
width_offset = (getRect().getWidth() - multi_track_height_width) / 2;
}
LLRect track_rect(width_offset, getRect().getHeight() - height_offset, getRect().getWidth() - width_offset, height_offset);
if(mDrawTrack)

8
indra/llui/llmultislider.h
View File

@ -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;
};

2
indra/llui/llmultisliderctrl.cpp
View File

@ -54,6 +54,7 @@ LLMultiSliderCtrl::Params::Params()
max_sliders("max_sliders", 1),
allow_overlap("allow_overlap", false),
loop_overlap("loop_overlap", false),
orientation("orientation"),
overlap_threshold("overlap_threshold", 0),
draw_track("draw_track", true),
use_triangle("use_triangle", false),
@ -170,6 +171,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLMultiSliderCtrl::Params& p)
params.max_sliders(p.max_sliders);
params.allow_overlap(p.allow_overlap);
params.loop_overlap(p.loop_overlap);
params.orientation(p.orientation());
if (p.overlap_threshold.isProvided())
{
params.overlap_threshold = p.overlap_threshold;

4
indra/llui/llmultisliderctrl.h
View File

@ -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();

6
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -588,7 +588,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
S32 x(0), y(0);
LLUI::getMousePositionLocal(mFramesSlider, &x, &y);
sliderpos = mFramesSlider->getSliderValueFromX(x);
sliderpos = mFramesSlider->getSliderValueFromPos(x, y);
}
else
{
@ -655,7 +655,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderDoubleClick(S32 x, S32 y, MASK mask)
void LLFloaterEditExtDayCycle::onFrameSliderMouseDown(S32 x, S32 y, MASK mask)
{
stopPlay();
F32 sliderpos = mFramesSlider->getSliderValueFromX(x);
F32 sliderpos = mFramesSlider->getSliderValueFromPos(x, y);
std::string slidername = mFramesSlider->getCurSlider();
@ -679,7 +679,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderMouseDown(S32 x, S32 y, MASK mask)
void LLFloaterEditExtDayCycle::onFrameSliderMouseUp(S32 x, S32 y, MASK mask)
{
F32 sliderpos = mFramesSlider->getSliderValueFromX(x);
F32 sliderpos = mFramesSlider->getSliderValueFromPos(x, y);
mTimeSlider->setCurSliderValue(sliderpos);
selectFrame(sliderpos, LLSettingsDay::DEFAULT_FRAME_SLOP_FACTOR);