From 80bfc56ff070614fee5b353056076ebed90f9039 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Fri, 28 Apr 2023 19:51:00 +0300 Subject: SL-19583 force reshape inventory panel when changing root in combination view --- indra/newview/llpanelmaininventory.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelmaininventory.cpp') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index b9099bbebf..4d6ff63f94 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -2211,6 +2211,9 @@ void LLPanelMainInventory::onCombinationRootChanged(bool gallery_clicked) } mForceShowInvLayout = false; updateTitle(); + + //force update scroll container + mCombinationInventoryPanel->reshape(getChild("combination_view_inventory")->getRect().getWidth(), 1, true); } void LLPanelMainInventory::updateCombinationVisibility() @@ -2250,8 +2253,8 @@ void LLPanelMainInventory::updateCombinationVisibility() } mCombinationScroller->reshape(llmax(inv_rect.getWidth(), galery_rect.getWidth()), inv_rect.getHeight() + galery_rect.getHeight(), true); - mCombinationGalleryPanel->handleReshape(galery_rect, false); - mCombinationInventoryPanel->handleReshape(inv_rect, false); + mCombinationGalleryPanel->setShape(galery_rect, false); + mCombinationInventoryPanel->setShape(inv_rect, false); } } -- cgit v1.2.3