From dac3cc2292898d1b1b69e560c2723bf3483f6a71 Mon Sep 17 00:00:00 2001
From: Xtarsia <69606701+Xtarsia@users.noreply.github.com>
Date: Sun, 8 Nov 2020 19:06:38 +0000
Subject: [PATCH] inventory alignment adjustments

closes #182
---
 .../data/gamedev/interfaces_v3/inventory.xml       | 14 +++++++-------
 .../client/data/gamedev/interfaces_v3/widgets.xml  |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ryzom/client/data/gamedev/interfaces_v3/inventory.xml b/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
index 6b36277c8..baebc815c 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
@@ -219,13 +219,13 @@
 <template name="tinv_animal" id="" bag_entry="" info_entry="" icon_db="">
 	<group id="#id" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0">
 		<instance template="tinv_nbslots_bulk_weight" id="ibw" x="0" inv_branch_nb="%max_animal_invslot" inv_branch="#bag_entry" inv_bulk_max="#info_entry:BULK_MAX" />
-		<instance template="tinv_item_list" id="iil" y="-16" sizeref="wh" h="-16" inv_branch_nb="%max_animal_invslot" inv_branch="#bag_entry" inv_type="#icon_db" animal_status="#info_entry:STATUS" />
+		<instance template="tinv_item_list" id="iil" y="-18" sizeref="wh" h="-16" inv_branch_nb="%max_animal_invslot" inv_branch="#bag_entry" inv_type="#icon_db" animal_status="#info_entry:STATUS" />
 		<view type="text" id="disable_txt" posref="BL BL" x="2" y="2" color="255 255 255 255" shadow="true" fontsize="10" />
 		<link expr="getAnimalInventoryStateText(@#info_entry:STATUS)" target="disable_txt:hardtext" />
 	</group>
 </template>
 <!-- FAKE SOLUTION -->
-<group type="container" id="inventory" header_active="false" resizer="true" pop_min_w="350" pop_min_h="240" pop_max_w="920" pop_max_h="1600" w="400" h="400" movable="true" active="false" opened="true" openable="false" global_color="false" global_color_over="true" on_active="set" on_active_params="dblink=UI:VARIABLES:ISACTIVE:INVENTORY|value=1" on_deactive="set" on_deactive_params="dblink=UI:VARIABLES:ISACTIVE:INVENTORY|value=0" resizer_top_size="5">
+<group type="container" id="inventory" header_active="false" resizer="true" pop_min_w="430" pop_min_h="240" pop_max_w="920" pop_max_h="1600" w="400" h="400" movable="true" active="false" opened="true" openable="false" global_color="false" global_color_over="true" on_active="set" on_active_params="dblink=UI:VARIABLES:ISACTIVE:INVENTORY|value=1" on_deactive="set" on_deactive_params="dblink=UI:VARIABLES:ISACTIVE:INVENTORY|value=0" resizer_top_size="5">
 	<group id="header_opened" x="0" y="0" w="100" h="28" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
 
 		<group type="tab" id="inv_select" child_resize_w="true" h="24" posref="TL TL" x="0" y="-4">
@@ -262,7 +262,7 @@
 		<group id="bag" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0">
 			<instance template="tinv_nbslots_bulk_weight" id="ibw" x="0" inv_branch="%bag" inv_bulk_max="%bag_bulk_max" />
 			<instance template="tinv_item_list" id="iil" inv_branch_nb="%max_bag_invslot" y="-18" sizeref="wh" h="-16" inv_branch="%bag" inv_type="INV_BAG" />
-			<instance template="argent" id="money" posref="BL BL" x="4" y="2" value="%money" />
+			<instance template="argent" id="money" posref="BL BL" x="4" y="0" value="%money" />
 		</group>
 		<!-- pa0 -->
 		<instance template="tinv_animal" id="pa0" info_entry="%pa_beast0" bag_entry="%pa_bag0" icon_db="INV_PA0" />
@@ -275,16 +275,16 @@
 		<!-- guild -->
 		<group id="guild" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0">
 			<instance template="tinv_nbslots_bulk_weight" id="ibw" x="0" inv_branch="%guild_inv_dbentry" inv_bulk_max="%guild_inv_bulk_max" />
-			<instance template="tinv_item_list" id="iil" inv_branch_nb="%max_guild_invslot" y="-16" sizeref="wh" h="-16" inv_branch="%guild_inv_dbentry" inv_type="INV_GUILD" />
-			<instance template="argent" id="money" posref="BL BL" x="4" y="2" value="%guild_inv_money" />
+			<instance template="tinv_item_list" id="iil" inv_branch_nb="%max_guild_invslot" y="-18" sizeref="wh" h="-16" inv_branch="%guild_inv_dbentry" inv_type="INV_GUILD" />
+			<instance template="argent" id="money" posref="BL BL" x="4" y="0" value="%guild_inv_money" />
 			<ctrl style="new_element_header" id="getmoney_but" posref="MR ML" posparent="money" x="4" wmargin="8" hardtext="uittGetMoney" onclick_l="proc" params_l="guild_get_money" />
 			<ctrl style="new_element_header" id="putmoney_but" posref="MR ML" posparent="getmoney_but" x="4" wmargin="8" hardtext="uittPutMoney" onclick_l="proc" params_l="guild_put_money" />
 		</group>
 		<!-- room -->
 		<group id="room" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0">
 			<instance template="tinv_nbslots_bulk_weight" id="ibw" x="-4" inv_branch="%room_inv_dbentry" inv_bulk_max="%room_inv_bulk_max" />
-			<instance template="tinv_item_list" id="iil" inv_branch_nb="%max_room_invslot" y="-16" sizeref="wh" h="-16" inv_branch="%room_inv_dbentry" inv_type="INV_ROOM" />
-			<instance template="argent" id="money" posref="BL BL" x="4" y="2" value="%room_inv_money" />
+			<instance template="tinv_item_list" id="iil" inv_branch_nb="%max_room_invslot" y="-18" sizeref="wh" h="-16" inv_branch="%room_inv_dbentry" inv_type="INV_ROOM" />
+			<instance template="argent" id="money" posref="BL BL" x="4" y="0" value="%room_inv_money" />
 		</group>
 	</group>
 </group>
diff --git a/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index 83dcf1042..0ea99eea7 100644
--- a/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -1378,13 +1378,13 @@
 	<group id="#id" posparent="#posparent" posref="#posref" x="#x" y="#y" sizeparent="#sizeparent" sizeref="#sizeref" w="#w" h="#h">
 		<!-- Bag Type -->
 		<!-- Bags : icon list -->
-		<group type="list_icon_bag" id="bag_icons" array="false" sizeref="wh" w="0" h="-24" posref="TL TL" x="0" y="0" child_resize_h="false" value="#inv_branch" maxitem="#inv_branch_nb" inv_type="#inv_type" sort_type="UI:SAVE:#inv_type:SORT_TYPE" filter_armor="UI:SAVE:#inv_type:FILTER_ARMOR" filter_weapon="UI:SAVE:#inv_type:FILTER_WEAPON" filter_tool="UI:SAVE:#inv_type:FILTER_TOOL" filter_mp="UI:SAVE:#inv_type:FILTER_MP" filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP" filter_tp="UI:SAVE:#inv_type:FILTER_TP" wspace="2" hspace="2" startitem="0" selection_group="inventory_selection" auto_grayed="true" dragable="true" oncandrag="inv_can_drag" ondrag="inv_drag" params_drag="from_icon_list" oncandrop="inv_can_drop" ondrop="inv_drop" menu_r="ui:interface:item_menu_in_bag" instant_help="false" lmargin="10" rmargin="0" tmargin="1" bmargin="0" column_center="false" db_animal_status="#animal_status">
+		<group type="list_icon_bag" id="bag_icons" array="false" sizeref="wh" w="0" h="-23" posref="TL TL" x="0" y="0" child_resize_h="false" value="#inv_branch" maxitem="#inv_branch_nb" inv_type="#inv_type" sort_type="UI:SAVE:#inv_type:SORT_TYPE" filter_armor="UI:SAVE:#inv_type:FILTER_ARMOR" filter_weapon="UI:SAVE:#inv_type:FILTER_WEAPON" filter_tool="UI:SAVE:#inv_type:FILTER_TOOL" filter_mp="UI:SAVE:#inv_type:FILTER_MP" filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP" filter_tp="UI:SAVE:#inv_type:FILTER_TP" wspace="2" hspace="2" startitem="0" selection_group="inventory_selection" auto_grayed="true" dragable="true" oncandrag="inv_can_drag" ondrag="inv_drag" params_drag="from_icon_list" oncandrop="inv_can_drop" ondrop="inv_drop" menu_r="ui:interface:item_menu_in_bag" instant_help="false" lmargin="10" rmargin="0" tmargin="1" bmargin="0" column_center="false" db_animal_status="#animal_status">
 			<ctrl style="skin_scroll" id="scroll_row" posref="TL TL" target_stepy="44" />
 		</group>
 		<view type="bitmap" id="sep1" x="0" y="0" posparent="bag_icons" posref="BL TL" scale="true" h="2" sizeref="w" texture="W_line_hor.tga" />
 		<link expr="eq(@UI:SAVE:#inv_type:ICON_LIST, 1)" target="bag_icons:active,sep1:active" />
 		<!-- Bags : detailed list -->
-		<group type="list_sheet_bag" id="bag_list" array="false" sizeref="wh" w="0" h="-34" posref="TL TL" x="0" y="1" child_resize_h="false" value="#inv_branch" maxitem="#inv_branch_nb" inv_type="#inv_type" sort_type="UI:SAVE:#inv_type:SORT_TYPE" filter_armor="UI:SAVE:#inv_type:FILTER_ARMOR" filter_weapon="UI:SAVE:#inv_type:FILTER_WEAPON" filter_tool="UI:SAVE:#inv_type:FILTER_TOOL" filter_mp="UI:SAVE:#inv_type:FILTER_MP" filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP" filter_tp="UI:SAVE:#inv_type:FILTER_TP" hspace="2" xitem="2" yitem="-2" xtext="46" ytext="-2" selection_group="inventory_selection" selection="false" auto_grayed="true" dragable="true" oncandrag="inv_can_drag" ondrag="inv_drag" params_drag="from_text_list" oncandrop="inv_can_drop" ondrop="inv_drop" menu_r="ui:interface:item_menu_in_bag" instant_help="false" over_color="%bot_chat_sheet_selection_normal" over_col_pushed="%bot_chat_sheet_selection_pushed" over_col_over="%bot_chat_sheet_selection_over" color="255 255 255 255" fontsize="8" shadow="true" multi_line="true" multi_line_space="0" db_animal_status="#animal_status">
+		<group type="list_sheet_bag" id="bag_list" array="false" sizeref="wh" w="0" h="-22" posref="TL TL" x="0" y="1" child_resize_h="false" value="#inv_branch" maxitem="#inv_branch_nb" inv_type="#inv_type" sort_type="UI:SAVE:#inv_type:SORT_TYPE" filter_armor="UI:SAVE:#inv_type:FILTER_ARMOR" filter_weapon="UI:SAVE:#inv_type:FILTER_WEAPON" filter_tool="UI:SAVE:#inv_type:FILTER_TOOL" filter_mp="UI:SAVE:#inv_type:FILTER_MP" filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP" filter_tp="UI:SAVE:#inv_type:FILTER_TP" hspace="2" xitem="2" yitem="-2" xtext="46" ytext="-2" selection_group="inventory_selection" selection="false" auto_grayed="true" dragable="true" oncandrag="inv_can_drag" ondrag="inv_drag" params_drag="from_text_list" oncandrop="inv_can_drop" ondrop="inv_drop" menu_r="ui:interface:item_menu_in_bag" instant_help="false" over_color="%bot_chat_sheet_selection_normal" over_col_pushed="%bot_chat_sheet_selection_pushed" over_col_over="%bot_chat_sheet_selection_over" color="255 255 255 255" fontsize="8" shadow="true" multi_line="true" multi_line_space="0" db_animal_status="#animal_status">
 			<!-- the scroll -->
 			<ctrl style="skin_scroll" id="scroll_row" posref="TL TL" target_stepy="44" />
 			<!-- the group to scroll -->
@@ -1396,14 +1396,14 @@
 		<instance template="tinv_item_list_icon_swap" id="detail" x="-2" y="10" posref="BR MR" dblink="UI:SAVE:#inv_type:ICON_LIST" texture="details_on.tga" tooltip="uittDetail" />
 		<link expr="ifthenelse(@UI:SAVE:#inv_type:ICON_LIST, 'details_off.tga', 'details_on.tga')" target="bit_detail:texture" />
 		<!-- filter -->
-		<instance template="tinv_item_list_filter" id="filter_tp" x="-8" posref="ML MR" posparent="detail" inv_type="#inv_type" dblink="UI:SAVE:#inv_type:FILTER_TP" texture="filter_tp.tga" tooltip="uittFilterTP" />
+		<instance template="tinv_item_list_filter" id="filter_tp" x="-7" posref="ML MR" posparent="detail" inv_type="#inv_type" dblink="UI:SAVE:#inv_type:FILTER_TP" texture="filter_tp.tga" tooltip="uittFilterTP" />
 		<instance template="tinv_item_list_filter" id="filter_missmp" x="-2" posref="ML MR" posparent="filter_tp" inv_type="#inv_type" dblink="UI:SAVE:#inv_type:FILTER_MISSMP" texture="filter_mission.tga" tooltip="uittFilterMissMP" />
 		<instance template="tinv_item_list_filter" id="filter_mp" x="-2" posref="ML MR" posparent="filter_missmp" inv_type="#inv_type" dblink="UI:SAVE:#inv_type:FILTER_MP" texture="filter_mps.tga" tooltip="uittFilterMP" />
 		<instance template="tinv_item_list_filter" id="filter_tool" x="-2" posref="ML MR" posparent="filter_mp" inv_type="#inv_type" dblink="UI:SAVE:#inv_type:FILTER_TOOL" texture="filter_tools.tga" tooltip="uittFilterTool" />
 		<instance template="tinv_item_list_filter" id="filter_weapon" x="-2" posref="ML MR" posparent="filter_tool" inv_type="#inv_type" dblink="UI:SAVE:#inv_type:FILTER_WEAPON" texture="filter_weapon.tga" tooltip="uittFilterWeapon" />
 		<instance template="tinv_item_list_filter" id="filter_armor" x="-2" posref="ML MR" posparent="filter_weapon" inv_type="#inv_type" dblink="UI:SAVE:#inv_type:FILTER_ARMOR" texture="filter_armor.tga" tooltip="uittFilterArmor" />
 		<!-- search -->
-		<ctrl type="button" id="but_inv_search" button_type="toggle_button" x="-2" posref="ML MR" posparent="but_filter_armor" tx_normal="w_button_filter_off.tga" tx_pushed="w_button_filter_on.tga" tx_over="" tooltip="uittInventorySearch" onclick_l="inv_search_button" params_l="inv_query_eb" />
+		<ctrl type="button" id="but_inv_search" button_type="toggle_button" x="-7" posref="ML MR" posparent="but_filter_armor" tx_normal="w_button_filter_off.tga" tx_pushed="w_button_filter_on.tga" tx_over="" tooltip="uittInventorySearch" onclick_l="inv_search_button" params_l="inv_query_eb" />
 		<view type="bitmap" id="bit_inv_search" posref="MM MM" posparent="but_inv_search" texture="w_help_1.tga" global_color="false" color="255 255 255 150" />
 		<instance template="edit_box_widget" id="inv_query_eb" active="false" posref="TR BR" posparent="but_detail" x="0" y="8" w="100" render_layer="9" clear_on_escape="true" enter_recover_focus="false" max_num_chars="20" max_historic="0" onenter="inv_set_search" onchange="inv_set_search" on_focus_lost="inv_search_unfocus" on_focus_lost_params="but_inv_search" />
 	</group>