diff options
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r-- | indra/newview/llfolderview.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 69c0c5b132..ebfb4efde2 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -104,8 +104,6 @@ public: Mandatory<LLPanel*> parent_panel; Optional<LLUUID> task_id; }; - LLFolderView( const std::string& name, LLUIImagePtr root_folder_icon, const LLRect& rect, - const LLUUID& source_id, LLPanel *parent_view ); LLFolderView(const Params&); virtual ~LLFolderView( void ); @@ -182,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(); @@ -250,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); @@ -329,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: |