diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-04-12 21:11:36 +0300 |
|---|---|---|
| committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-04-12 21:11:36 +0300 |
| commit | 37530c9d736d90ec29b97e3567346a02e2826f97 (patch) | |
| tree | ce6bbd2c701e9c0bc86a839918bc7f9801ddb4f9 /indra/llui | |
| parent | c6d2bf93c02c6099f4c86a3379c3e82e21f9f37e (diff) | |
SL-19544 WIP hide inventory pane in Combination view, if there is no visible items
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 5 | ||||
| -rw-r--r-- | indra/llui/llfolderview.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 734a7599aa..14985c6bad 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -189,7 +189,8 @@ LLFolderView::LLFolderView(const Params& p) mStatusTextBox(NULL), mShowItemLinkOverlays(p.show_item_link_overlays), mViewModel(p.view_model), - mGroupedItemModel(p.grouped_item_model) + mGroupedItemModel(p.grouped_item_model), + mForceArrange(false) { LLPanel* panel = p.parent_panel; mParentPanel = panel->getHandle(); @@ -1736,7 +1737,7 @@ void LLFolderView::update() mNeedsAutoSelect = FALSE; } - BOOL is_visible = isInVisibleChain(); + BOOL is_visible = isInVisibleChain() || mForceArrange; //Puts folders/items in proper positions // arrange() takes the model filter flag into account and call sort() if necessary (CHUI-849) diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index fbd8522b19..f19df1d0dc 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -241,6 +241,8 @@ public: void setCallbackRegistrar(LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* registrar) { mCallbackRegistrar = registrar; } void setEnableRegistrar(LLUICtrl::EnableCallbackRegistry::ScopedRegistrar* registrar) { mEnableRegistrar = registrar; } + void setForceArrange(bool force) { mForceArrange = force; } + LLPanel* getParentPanel() { return mParentPanel.get(); } // DEBUG only void dumpSelectionInformation(); @@ -337,6 +339,8 @@ protected: LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* mCallbackRegistrar; LLUICtrl::EnableCallbackRegistry::ScopedRegistrar* mEnableRegistrar; + + bool mForceArrange; public: static F32 sAutoOpenTime; |