From 0fe0007d48e72e05d8e026c978341385c8c018c2 Mon Sep 17 00:00:00 2001
From: Sit Melai <sitmelai@gmail.com>
Date: Mon, 15 May 2017 17:05:01 +0200
Subject: [PATCH] =?UTF-8?q?F=C3=AAnetre=20que=20avec=20les=20mains=20rajou?=
 =?UTF-8?q?t=C3=A9,=20la=20largeur=20est=20cependant=20pas=20encore=20bien?=
 =?UTF-8?q?=20g=C3=A9r=C3=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/kh/kh_interfaces/inventory.xml | 127 +++++++++++++---------------
 data/kh/kh_interfaces/taskbar.xml   |  10 +--
 2 files changed, 62 insertions(+), 75 deletions(-)

diff --git a/data/kh/kh_interfaces/inventory.xml b/data/kh/kh_interfaces/inventory.xml
index c17d3937..574347c6 100644
--- a/data/kh/kh_interfaces/inventory.xml
+++ b/data/kh/kh_interfaces/inventory.xml
@@ -1223,91 +1223,78 @@
   <!-- The Hands -->
   <!-- Hand 1 and 2 -->
 
-    <group type="container"
+  <group type="container"
          id="gestionsetshands"
-         w="410"
-         h="48"
+	 child_resize_wmargin="10"
+	 child_resize_hmargin="10"
          resizer="false"
-         header_active="false"
+         header_active="fase"
          right_button="false"
          group_onclick_r="active_menu"
          group_params_r="menu=ui:interface:base_menu_with_color"
          movable="true"
-         active="false"
+         active="true"
          opened="false"
          openable="false"
          global_color="false"
          header_color="UI:SAVE:WIN:COLORS:INV"
-         locked="true"
+         locked="false"
          on_active="set"
          on_active_params="dblink=UI:VARIABLES:ISACTIVE:SETS3|value=1"
          on_deactive="set"
          on_deactive_params="dblink=UI:VARIABLES:ISACTIVE:SETS3|value=0"
          help_page="interf_action_bar.html">
-<!--         on_move="lua:game:updateCurrentActionPosition()"> -->
-    <group id="header_closed"
-           x="0"
-           y="0"
-           h="48"
-           w="394"
-           posref="TL TL" />
-    <group id="hands"
-           x="9"
-           y="0"
-           w="392"
-           h="68"
-           posref="ML ML"
-           setnumber="1">
-      <ctrl type="sheet"
-            id="handr"
-            posref="MR MR"
-            x="0"
-            tx_noitem="hand_right.tga"
-            selection_group="inventory_selection"
-            onclick_l="proc"
-            params_l="inv_left_click_on_slot"
-            tooltip="uittHandR"
-            menu_r="%self_item_modal_menu"
-            dragable="true"
-            ondrag="inv_drag"
-            params_drag="from_slot"
-            oncannotdrop="inv_cannot_drop"
-            oncandrop="inv_can_drop"
-            ondrop="inv_drop"
-            item_slot="RIGHT_HAND"
-            value="%hand_r"
-            other_hand_slot="handl"
-            auto_grayed="false"
-            tooltip_parent="win" />
-      <ctrl type="sheet"
-            id="handl"
-            posref="ML ML"
-            x="0"
-            tx_noitem="hand_left.tga"
-            selection_group="inventory_selection"
-            onclick_l="proc"
-            params_l="inv_left_click_on_slot"
-            tooltip="uittHandL"
-            menu_r="%self_item_modal_menu"
-            dragable="true"
-            ondrag="inv_drag"
-            params_drag="from_slot"
-            oncannotdrop="inv_cannot_drop"
-            oncandrop="inv_can_drop"
-            ondrop="inv_drop"
-            item_slot="LEFT_HAND"
-            value="%hand_l"
-            other_hand_slot="handr"
-            auto_grayed="false"
-            tooltip_parent="win" />
-      <!-- Must update some things when the item equipped change -->
-      <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)"
-            action="phrase_update_from_hand" />
-      <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)"
-            action="phrase_update_from_hand" />
-      <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:ENCHANT)"
-            action="phrase_update_from_hand" />
-    </group>
+    <ctrl type="sheet"
+          id="handr"
+	  posparent="handl"
+          posref="MR ML"
+          x="10"
+          tx_noitem="hand_right.tga"
+          selection_group="inventory_selection"
+          onclick_l="proc"
+          params_l="inv_left_click_on_slot"
+          tooltip="uittHandR"
+          menu_r="%self_item_modal_menu"
+          dragable="true"
+          ondrag="inv_drag"
+          params_drag="from_slot"
+          oncannotdrop="inv_cannot_drop"
+          oncandrop="inv_can_drop"
+          ondrop="inv_drop"
+          item_slot="RIGHT_HAND"
+          value="%hand_r"
+          other_hand_slot="handl"
+          auto_grayed="false"
+          tooltip_parent="win" />
+    <ctrl type="sheet"
+          id="handl"
+	  posparent="gestionsetshands"
+          posref="ML ML"
+          x="10"
+          tx_noitem="hand_left.tga"
+          selection_group="inventory_selection"
+          onclick_l="proc"
+          params_l="inv_left_click_on_slot"
+          tooltip="uittHandL"
+          menu_r="%self_item_modal_menu"
+          dragable="true"
+          ondrag="inv_drag"
+          params_drag="from_slot"
+          oncannotdrop="inv_cannot_drop"
+          oncandrop="inv_can_drop"
+          ondrop="inv_drop"
+          item_slot="LEFT_HAND"
+          value="%hand_l"
+          other_hand_slot="handr"
+          auto_grayed="false"
+          tooltip_parent="win" />
+    <!-- Must update some things when the item equipped change -->
+    <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)"
+          action="phrase_update_from_hand" />
+    <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)"
+          action="phrase_update_from_hand" />
+    <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:ENCHANT)"
+          action="phrase_update_from_hand" />
   </group>
   <tree node="gestionsetshands" />
   
diff --git a/data/kh/kh_interfaces/taskbar.xml b/data/kh/kh_interfaces/taskbar.xml
index 85904a87..336e662f 100644
--- a/data/kh/kh_interfaces/taskbar.xml
+++ b/data/kh/kh_interfaces/taskbar.xml
@@ -1008,7 +1008,7 @@
 	
 
 <!-- * INVENTORY * -->	
-	
+
 	<group id="inventory" w="256" child_resize_h="true" posparent="status" posref="TR TL" x="30" y="0" >
 		<instance template="special_border" color="UI:SAVE:WIN:COLORS:INV" />
 
@@ -1019,11 +1019,11 @@
 
 		<instance template="win_button" id="hands2" color="UI:SAVE:WIN:COLORS:INV" text="uimwHands2" posparent="hands" posref="BL TL" x="0" y="-4"
 			  pushflag="UI:VARIABLES:ISACTIVE:SETS2" win_name="gestionsets2" />
-
-		<instance template="win_button" id="hands3" color="UI:SAVE:WIN:COLORS:INV" text="uimwHands" posref="TL TL" x="0" y="-30"
-			pushflag="UI:VARIABLES:ISACTIVE:SETS3" win_name="gestionsetshands" />
 			
-		<instance template="win_button" id="invent" color="UI:SAVE:WIN:COLORS:INV" text="uimwInventory" posparent="hands2" posref="BL TL" x="0" y="-4"
+<instance template="win_button" id="hands3" color="UI:SAVE:WIN:COLORS:INV" text="uimwHands3" posparent="hands2" posref="BL TL" x="0" y="-4"
+	  pushflag="UI:VARIABLES:ISACTIVE:SETS3" win_name="gestionsetshands" />
+
+		<instance template="win_button" id="invent" color="UI:SAVE:WIN:COLORS:INV" text="uimwInventory" posparent="hands3" posref="BL TL" x="0" y="-4"
 			pushflag="UI:VARIABLES:ISACTIVE:INVENTORY" win_name="inventory" />
 
 		<instance template="win_button" id="action_book" color="UI:SAVE:WIN:COLORS:INV" text="uiPhraseBookTitle" posparent="invent" posref="BL TL" x="0" y="-4"