diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-03 20:44:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-03 20:44:00 -0700 |
| commit | 7c7cc56b037f05f148a7215d0c5f567989a0c012 (patch) | |
| tree | 11afb3864d36de63ccd2b1dffa7ba2daebd82e9f /indra/llui/llfolderviewitem.cpp | |
| parent | b6ad7db0d61033425a4f65270731023afe74ecce (diff) | |
| parent | 3b39ec165aa837d02bf1bf57ff8f3aab3229659c (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index b289581dc2..c5231c4f08 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -1838,7 +1838,7 @@ BOOL LLFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask ) } if( !handled ) { - if(mIndentation < x && x < mIndentation + mArrowSize + mTextPad) + if(mIndentation < x && x < mIndentation + (isMinimized() ? 0 : mArrowSize) + mTextPad) { toggleOpen(); handled = TRUE; @@ -1862,7 +1862,7 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask ) } if( !handled ) { - if(mIndentation < x && x < mIndentation + mArrowSize + mTextPad) + if(mIndentation < x && x < mIndentation + (isMinimized() ? 0 : mArrowSize) + mTextPad) { // don't select when user double-clicks plus sign // so as not to contradict single-click behavior |