mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-30 04:40:53 +00:00
Merge with develop
This commit is contained in:
parent
f77aa34ee6
commit
0be0a1e9e7
2 changed files with 5 additions and 6 deletions
|
@ -4387,7 +4387,6 @@ namespace NLGUI
|
|||
ctrlButton->setToolTipParent(TTMouse);
|
||||
ctrlButton->setToolTipParentPosRef(Hotspot_TTAuto);
|
||||
ctrlButton->setToolTipPosRef(Hotspot_TTAuto);
|
||||
ctrlButton->setActionOnLeftClickParams(tooltip);
|
||||
}
|
||||
|
||||
getParagraph()->addChild (ctrlButton);
|
||||
|
|
|
@ -1740,7 +1740,7 @@
|
|||
</proc>
|
||||
|
||||
|
||||
<group type="modal" id="appear_infos1" x="0" y="0" w="824" h="768" posref="TR TR" render_layer="1"
|
||||
<group type="modal" id="appear_infos1" x="74" y="0" w="824" h="768" posref="MM MM" render_layer="1"
|
||||
mouse_pos="false" escapable="false" exit_click_out="true" savable="false"
|
||||
display="false"
|
||||
>
|
||||
|
@ -1765,7 +1765,7 @@
|
|||
onclick_l="proc" params_l="proc_charsel_infos"/>
|
||||
</group>
|
||||
|
||||
<group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
|
||||
<group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
|
||||
mouse_pos="false" escapable="false" exit_click_out="true"
|
||||
display="false"
|
||||
>
|
||||
|
@ -1778,7 +1778,7 @@
|
|||
onclick_l="proc" params_l="proc_charsel_infos"/>
|
||||
</group>
|
||||
|
||||
<group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
|
||||
<group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
|
||||
mouse_pos="false" escapable="false" exit_click_out="true"
|
||||
display="false"
|
||||
>
|
||||
|
@ -1791,7 +1791,7 @@
|
|||
onclick_l="proc" params_l="proc_charsel_infos"/>
|
||||
</group>
|
||||
|
||||
<group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
|
||||
<group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
|
||||
mouse_pos="false" escapable="false" exit_click_out="true"
|
||||
display="false"
|
||||
>
|
||||
|
@ -1804,7 +1804,7 @@
|
|||
onclick_l="proc" params_l="proc_charsel_infos"/>
|
||||
</group>
|
||||
|
||||
<group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
|
||||
<group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
|
||||
mouse_pos="false" escapable="false" exit_click_out="true"
|
||||
display="false"
|
||||
>
|
||||
|
|
Loading…
Reference in a new issue