diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llui/llsliderctrl.cpp | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/llui/llsliderctrl.cpp')
| -rw-r--r-- | indra/llui/llsliderctrl.cpp | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp index 3ff3a4f884..763be1d7e3 100644 --- a/indra/llui/llsliderctrl.cpp +++ b/indra/llui/llsliderctrl.cpp @@ -81,7 +81,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect, mSliderMouseUpCallback( NULL ), mSliderMouseDownCallback( NULL ) { - S32 top = mRect.getHeight(); + S32 top = getRect().getHeight(); S32 bottom = 0; S32 left = 0; @@ -97,7 +97,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect, addChild(mLabelBox); } - S32 slider_right = mRect.getWidth(); + S32 slider_right = getRect().getWidth(); if( show_text ) { slider_right = text_left - SLIDERCTRL_SPACING; @@ -115,7 +115,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect, if( show_text ) { - LLRect text_rect( text_left, top, mRect.getWidth(), bottom ); + LLRect text_rect( text_left, top, getRect().getWidth(), bottom ); if( can_edit_text ) { mEditor = new LLLineEditor( "SliderCtrl Editor", text_rect, @@ -144,10 +144,6 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect, updateText(); } -LLSliderCtrl::~LLSliderCtrl() -{ - // Children all cleaned up by default view destructor. -} // static void LLSliderCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata ) @@ -158,10 +154,6 @@ void LLSliderCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata self->onFocusReceived(); } -F32 LLSliderCtrl::getValueF32() const -{ - return mSlider->getValueF32(); -} void LLSliderCtrl::setValue(F32 v, BOOL from_event) { @@ -209,11 +201,6 @@ void LLSliderCtrl::clear() } -BOOL LLSliderCtrl::isMouseHeldDown() -{ - return mSlider->hasMouseCapture(); -} - void LLSliderCtrl::updateText() { if( mEditor || mTextBox ) @@ -427,18 +414,6 @@ void LLSliderCtrl::reportInvalidData() make_ui_sound("UISndBadKeystroke"); } -//virtual -LLString LLSliderCtrl::getControlName() const -{ - return mSlider->getControlName(); -} - -// virtual -void LLSliderCtrl::setControlName(const LLString& control_name, LLView* context) -{ - mSlider->setControlName(control_name, context); -} - // virtual LLXMLNodePtr LLSliderCtrl::getXML(bool save_children) const { |