diff options
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 4 | ||||
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 1 | ||||
| -rwxr-xr-x | indra/newview/llconversationview.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 4825fc613c..7c63cad1b7 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -1826,7 +1826,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; @@ -1850,7 +1850,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 diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index d4002c3184..7cbe70fb8b 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -289,6 +289,7 @@ protected: friend class LLUICtrlFactory; void updateLabelRotation(); + virtual bool isMinimized() { return FALSE; } public: typedef std::list<LLFolderViewItem*> items_t; diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index bd95387bbe..4d77a4ade0 100755 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -69,6 +69,8 @@ public: /*virtual*/ void toggleOpen(); + /*virtual*/ bool isMinimized() { return mMinimizedMode; } + void toggleMinimizedMode(bool is_minimized); void setVisibleIfDetached(BOOL visible); |