From 7ac094e92105122b22b4693dafae7f0cee72d9a0 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Tue, 13 Jun 2023 08:45:13 +0200 Subject: SL-18977 Borders of inventory view in inventory floater seem to be cut a bit --- indra/newview/llinventorypanel.cpp | 1 - .../skins/default/xui/en/floater_my_inventory.xml | 26 +- .../skins/default/xui/en/panel_main_inventory.xml | 473 ++++++++++----------- .../skins/default/xui/en/sidepanel_inventory.xml | 244 +++++------ 4 files changed, 351 insertions(+), 393 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index f7a24a09c0..2fefacf90b 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -298,7 +298,6 @@ void LLInventoryPanel::initFolderRoot() // Scroller LLRect scroller_view_rect = getRect(); scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom); - scroller_view_rect.mTop -= 3; LLScrollContainer::Params scroller_params(mParams.scroll()); scroller_params.rect(scroller_view_rect); mScroller = LLUICtrlFactory::create(scroller_params); diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml index a9900f05b7..b75744d432 100644 --- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml @@ -1,22 +1,22 @@ - + reuse_instance="true" > + diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 64b885c222..b170885178 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -1,13 +1,12 @@ + min_width="240" > @@ -27,18 +26,18 @@ Multi_Folder_Mode Single_Folder_Mode + name="ItemcountText" + type="string" + length="1" + follows="left|top|right" + layout="topleft" + height="13" + left="10" + right="-10" + font="SansSerifMedium" + text_color="InventoryItemLinkColor" + use_ellipses="true" + top_pad="0"> Items: -