diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 19:40:09 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 19:40:09 +0300 |
| commit | 231dea378babc0ee9806f0fcd68283e79f81d2eb (patch) | |
| tree | d4e42cf3ea6c212ffb1e2958f6cb6568ac5bdd0a /indra/llui/llfolderview.h | |
| parent | e77134ea898cd19fdba716e46324b2945ef6826f (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/llui/llfolderview.h')
| -rw-r--r-- | indra/llui/llfolderview.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index 2926e160d0..6bb5e6c02e 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -90,9 +90,11 @@ public: Optional<std::string> title; Optional<bool> use_label_suffix, allow_multiselect, + allow_drag, show_empty_message, use_ellipses, - show_item_link_overlays; + show_item_link_overlays, + suppress_folder_menu; Mandatory<LLFolderViewModelInterface*> view_model; Optional<LLFolderViewGroupedItemModel*> grouped_item_model; Mandatory<std::string> options_menu; @@ -123,6 +125,7 @@ public: void setReshapeCallback(const signal_t::slot_type& cb) { mReshapeSignal.connect(cb); } bool getAllowMultiSelect() { return mAllowMultiSelect; } + bool getAllowDrag() { return mAllowDrag; } // Close all folders in the view void closeAllFolders(); @@ -259,6 +262,8 @@ protected: void closeRenamer( void ); + bool isFolderSelected(); + bool selectFirstItem(); bool selectLastItem(); @@ -271,6 +276,7 @@ protected: selected_items_t mSelectedItems; bool mKeyboardSelection, mAllowMultiSelect, + mAllowDrag, mShowEmptyMessage, mShowFolderHierarchy, mNeedsScroll, @@ -282,7 +288,8 @@ protected: mDragAndDropThisFrame, mShowItemLinkOverlays, mShowSelectionContext, - mShowSingleSelection; + mShowSingleSelection, + mSuppressFolderMenu; // Renaming variables and methods LLFolderViewItem* mRenameItem; // The item currently being renamed |