diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-13 01:28:38 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-13 01:28:38 -0400 |
| commit | 39c2a584f47785c826c3bc133106f3689120bf32 (patch) | |
| tree | 898695d92fc467672618f08260106ab773e456b5 /indra/llui/llscrollbar.cpp | |
| parent | a15feff98c13cd693e60fc59345609c007de16db (diff) | |
| parent | efd58603da6062d90a5d7019987409994bc73858 (diff) | |
Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.
Diffstat (limited to 'indra/llui/llscrollbar.cpp')
| -rw-r--r-- | indra/llui/llscrollbar.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp index bc489592d4..566825ff3b 100644 --- a/indra/llui/llscrollbar.cpp +++ b/indra/llui/llscrollbar.cpp @@ -497,8 +497,8 @@ void LLScrollbar::draw() } // Draw background and thumb. - if ( ( mOrientation == VERTICAL&&(mThumbImageV.isNull() || mThumbImageV.isNull()) ) - || (mOrientation == HORIZONTAL&&(mTrackImageH.isNull() || mThumbImageH.isNull()) )) + if ( ( mOrientation == VERTICAL&&(mThumbImageV.isNull() || mThumbImageH.isNull()) ) + || (mOrientation == HORIZONTAL&&(mTrackImageH.isNull() || mTrackImageV.isNull()) )) { gl_rect_2d(mOrientation == HORIZONTAL ? mThickness : 0, mOrientation == VERTICAL ? getRect().getHeight() - 2 * mThickness : getRect().getHeight(), @@ -513,7 +513,6 @@ void LLScrollbar::draw() // Thumb LLRect outline_rect = mThumbRect; outline_rect.stretch(2); - S32 rect_fix = 0; // Background if(mOrientation == HORIZONTAL) @@ -521,7 +520,7 @@ void LLScrollbar::draw() mTrackImageH->drawSolid(mThickness //S32 x , 0 //S32 y , getRect().getWidth() - 2 * mThickness //S32 width - , getRect().getHeight()- rect_fix //S32 height + , getRect().getHeight() //S32 height , mTrackColor.get()); //const LLColor4& color if (gFocusMgr.getKeyboardFocus() == this) @@ -540,7 +539,7 @@ void LLScrollbar::draw() } else if(mOrientation == VERTICAL) { - mTrackImageV->drawSolid( 0+rect_fix //S32 x + mTrackImageV->drawSolid( 0 //S32 x , mThickness //S32 y , getRect().getWidth() //S32 width , getRect().getHeight() - 2 * mThickness //S32 height |