From eaf95d084a585c8a0a9ac086679487fa40e1db71 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Sat, 6 May 2023 03:17:45 +0300 Subject: SL-19689 In combination view 'raname' field doesn't update position properly --- indra/llui/llfolderview.h | 2 +- indra/newview/llpanelmaininventory.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index f19df1d0dc..22b8c475ec 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -255,13 +255,13 @@ public: virtual void updateMenu(); void finishRenamingItem( void ); + void updateRenamerPosition(); // Note: We may eventually have to move that method up the hierarchy to LLFolderViewItem. LLHandle getHandle() const { return getDerivedHandle(); } private: void updateMenuOptions(LLMenuGL* menu); - void updateRenamerPosition(); protected: LLScrollContainer* mScrollContainer; // NULL if this is not a child of a scroll container. diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index c57ff26b91..06b71d0f7a 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -2357,6 +2357,12 @@ void LLPanelMainInventory::updateCombinationVisibility() { scrollToInvPanelSelection(); } + + LLFolderView* root_folder = mCombinationInventoryPanel->getRootFolder(); + if (root_folder) + { + root_folder->updateRenamerPosition(); + } } } -- cgit v1.2.3