diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-07 19:00:35 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-07 19:00:35 -0800 |
| commit | 79b44fa561f58cdb47b7cfa6d0b55311d71688a8 (patch) | |
| tree | 0ad10576473d9ae9fa17d9b4b1db136871958ae4 /indra/llui | |
| parent | a6f1690128b510977cfe86071f80f81967b9d0c7 (diff) | |
| parent | b1b4b78d5c97659d82ff67b38db4d4188967efbb (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 4 | ||||
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 60a6d3e3ea..0a06ce66aa 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -1862,7 +1862,7 @@ BOOL LLFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask ) } if( !handled ) { - if(mIndentation < x && x < mIndentation + (isMinimized() ? 0 : mArrowSize) + mTextPad) + if(mIndentation < x && x < mIndentation + (isCollapsed() ? 0 : mArrowSize) + mTextPad) { toggleOpen(); handled = TRUE; @@ -1886,7 +1886,7 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask ) } if( !handled ) { - if(mIndentation < x && x < mIndentation + (isMinimized() ? 0 : mArrowSize) + mTextPad) + if(mIndentation < x && x < mIndentation + (isCollapsed() ? 0 : mArrowSize) + mTextPad) { // don't select when user double-clicks plus sign // so as not to contradict single-click behavior diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index f33f21c8f8..d7f5e86aea 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -296,7 +296,7 @@ protected: friend class LLUICtrlFactory; void updateLabelRotation(); - virtual bool isMinimized() { return FALSE; } + virtual bool isCollapsed() { return FALSE; } public: typedef std::list<LLFolderViewItem*> items_t; |