From 8103710c054ec6ea4a46f9732e569e543691184b Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 19 Oct 2009 01:45:44 +0000 Subject: Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231 * Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476 * IM changes --- indra/newview/llfolderview.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'indra/newview/llfolderview.h') diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index c95dc6e5bd..ebfb4efde2 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -180,6 +180,9 @@ public: BOOL startDrag(LLToolDragAndDrop::ESource source); void setDragAndDropThisFrame() { mDragAndDropThisFrame = TRUE; } + void setDraggingOverItem(LLFolderViewItem* item) { mDraggingOverItem = item; } + LLFolderViewItem* getDraggingOverItem() { return mDraggingOverItem; } + // deletion functionality void removeSelectedItems(); @@ -248,6 +251,8 @@ public: void setShowSingleSelection(BOOL show); BOOL getShowSingleSelection() { return mShowSingleSelection; } F32 getSelectionFadeElapsedTime() { return mMultiSelectionFadeTimer.getElapsedTimeF32(); } + void setUseEllipses(bool use_ellipses) { mUseEllipses = use_ellipses; } + bool getUseEllipses() { return mUseEllipses; } void addItemID(const LLUUID& id, LLFolderViewItem* itemp); void removeItemID(const LLUUID& id); @@ -327,6 +332,17 @@ protected: LLPanel* mParentPanel; + /** + * Is used to determine if we need to cut text In LLFolderViewItem to avoid horizontal scroll. + * NOTE: For now it uses only to cut LLFolderViewItem::mLabel text to be used for Landmarks in Places Panel. + */ + bool mUseEllipses; // See EXT-719 + + /** + * Contains item under mouse pointer while dragging + */ + LLFolderViewItem* mDraggingOverItem; // See EXT-719 + LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* mCallbackRegistrar; public: -- cgit v1.2.3