livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19795 fix inventory list offset

meow-7.2.2
Andrey Kleshchev 2023-05-31 22:31:24 +03:00
parent 2331190310
commit 49b817d506
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpanelmaininventory.cpp
View File

@ -258,6 +258,8 @@ BOOL LLPanelMainInventory::postBuild()
mListViewPanel = getChild<LLPanel>("single_folder_inventory");
mGalleryViewPanel = getChild<LLPanel>("gallery_view_inventory");
mCombinationViewPanel = getChild<LLPanel>("combination_view_inventory");
mCombinationGalleryLayoutPanel = getChild<LLLayoutPanel>("comb_gallery_layout");
mCombinationListLayoutPanel = getChild<LLLayoutPanel>("comb_inventory_layout");
mSingleFolderPanelInventory = getChild<LLInventorySingleFolderPanel>("single_folder_inv");
mListViewRootUpdatedConnection = mSingleFolderPanelInventory->setRootChangedCallback(boost::bind(&LLPanelMainInventory::updateTitle, this));
@ -2306,8 +2308,8 @@ void LLPanelMainInventory::updateCombinationVisibility()
{
bool is_gallery_empty = !mCombinationGalleryPanel->hasVisibleItems();
bool show_inv_pane = mCombinationInventoryPanel->hasVisibleItems() || is_gallery_empty || mForceShowInvLayout;
getChild<LLLayoutPanel>("comb_gallery_layout")->setVisible(!is_gallery_empty);
getChild<LLLayoutPanel>("comb_inventory_layout")->setVisible(show_inv_pane);
mCombinationGalleryLayoutPanel->setVisible(!is_gallery_empty);
mCombinationListLayoutPanel->setVisible(show_inv_pane);
mCombinationInventoryPanel->getRootFolder()->setForceArrange(!show_inv_pane);
if(mCombinationInventoryPanel->hasVisibleItems())
{

2
indra/newview/llpanelmaininventory.h
View File

@ -210,6 +210,8 @@ private:
LLInventorySingleFolderPanel* mCombinationInventoryPanel;
LLInventoryGallery* mCombinationGalleryPanel;
LLPanel* mCombinationViewPanel;
LLPanel* mCombinationGalleryLayoutPanel;
LLPanel* mCombinationListLayoutPanel;
boost::signals2::connection mListViewRootUpdatedConnection;
boost::signals2::connection mGalleryRootUpdatedConnection;

3
indra/newview/skins/default/xui/en/panel_main_inventory.xml
View File

@ -339,6 +339,7 @@
width="312">
<layout_stack
follows="all"
layout="topleft"
height="372"
width="312"
animate="false"
@ -364,7 +365,7 @@
class="inventory_gallery"
filename="panel_inventory_gallery.xml"
left="0"
top_pad="0"
top="1"
height="246"
width="312"
name="comb_gallery_view_inv"