diff options
author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-06 15:19:10 +0200 |
---|---|---|
committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-06 15:19:10 +0200 |
commit | 5f6d55eb1b264780fbb703b115e9b4428cc4ee2b (patch) | |
tree | 2b5c35ee9473c59c4a3f3434cf1dcc31b3211824 /indra/llui | |
parent | 04dee1bad92da5910394f920247db60bade9ecc1 (diff) |
CHUI-444 (Click target off when conversation list is minimized to icons)
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 9b54a7a467..9facf65802 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -1863,7 +1863,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; @@ -1887,7 +1887,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 2e633a39e5..a35193f948 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -292,7 +292,7 @@ protected: friend class LLUICtrlFactory; void updateLabelRotation(); - virtual bool isMinimized() { return FALSE; } + virtual bool isCollapsed() { return FALSE; } public: typedef std::list<LLFolderViewItem*> items_t; |