From 1bff654c7bf632c3170f37c0ffc476fdb0c97858 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Thu, 16 Jun 2016 23:32:47 +0300
Subject: [PATCH] Merge with develop

---
 .../client/data/gamedev/interfaces_v3/macros.xml     | 12 ++++++------
 .../ryzom/client/src/interface_v3/macrocmd_manager.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
index 65d6394d7..5dc1142bf 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
@@ -405,12 +405,12 @@
 				 onclick_l="new_macro_new_cmd" />
 		
 		
-		<group id="cmds" type="list" posref="BR TR" posparent="sep" x="0" y="-22" over="true" >
-<!--
-			<instance template="macro_command" id="cmd1" posref="TL TL" />
-			<instance template="macro_command" id="cmd2" posparent="cmd1" posref="BL TL" />
--->
+	<group id="cmds" x="0" y="-22" over="true" sizeref="w" posref="TL TL" posparent="sep" child_resize_h="true" child_resize_hmargin="4">
+		<group id="macros" x="10" y="-4" sizeref="w" posref="TL TL" child_resize_h="true" max_h="300" >
+			<group id="list" type="list" x="0" y="0" posref="TL TL" />
 		</group>
+		<ctrl style="skin_scroll" id="sv" posref="TL TL" y="-4" target="macros" />
+	</group>
 		
 		<instance template="button_ok_cancel" posparent="cmds" posref="BR TR" x="0" y="-4" 
 					onclick_ok="new_macro_ok" 
@@ -660,4 +660,4 @@
 	<tree node="keys_r2ed"/>
 </tree>
 
-</interface_config>
\ No newline at end of file
+</interface_config>
diff --git a/code/ryzom/client/src/interface_v3/macrocmd_manager.h b/code/ryzom/client/src/interface_v3/macrocmd_manager.h
index 8891f26b8..37f2f7bee 100644
--- a/code/ryzom/client/src/interface_v3/macrocmd_manager.h
+++ b/code/ryzom/client/src/interface_v3/macrocmd_manager.h
@@ -182,7 +182,7 @@ private:
 #define	NEWMACRO_TITLE_EDIT						"uiEditMacro"
 #define CTRL_NEWMACRO_ICON						"ui:interface:new_macro:content:icon"
 #define GROUP_NEWMACRO_EDIT_NAME				"ui:interface:new_macro:content:edit_name"
-#define GROUP_NEWMACRO_COMMANDS					"ui:interface:new_macro:content:cmds"
+#define GROUP_NEWMACRO_COMMANDS					"ui:interface:new_macro:content:cmds:macros:list"
 #define	VIEW_NEWMACRO_KEY						"ui:interface:new_macro:content:macro_key"
 #define TEMPLATE_NEWMACRO_COMMAND				"macro_command"
 #define TEMPLATE_NEWMACRO_COMMAND_TEXT			"macro_name"