Merge with develop

This commit is contained in:
kervala 2016-10-22 19:40:34 +02:00
parent 14917f114f
commit bb9608bcea

View file

@ -419,14 +419,14 @@
<!-- NAME OF SPELL -->
<instance template="edit_box_widget" id="eb_spell_name" posref="TR BR" x="4" w="216" y="-54" h="20" child_resize="false"
<instance template="edit_box_widget" id="eb_spell_name" posref="TR BR" x="0" w="216" y="-54" h="20" child_resize="false"
text_x="0" text_y="0" text_ref="ML ML"
fontsize="12" multi_line="false" max_num_chars="20"
enter_loose_focus="true" enter_recover_focus="false" prompt="" reset_focus_on_hide="true" onchange="phrase_change_name" />
<view type="text" id="text_spell_name" posparent="eb_spell_name" posref="TL BL" x="0" y="-2" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiPhraseEditName" />
<!-- INFOS -->
<group id="infos" w="256" h="80" posparent="back" posref="BL TL" x="0" y="-4" >
<group id="infos" w="256" h="90" posparent="back" posref="BL TL" x="0" y="-4" >
<!-- Sabrina Cost -->
<view type="text" id="totaltext" posref="TL TL" fontsize="12" global_color="true" shadow="true" color="255 255 255 255" hardtext="uiPhraseTotal" />