mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-22 23:26:15 +00:00
text posref is now an enum too.
--HG-- branch : gsoc2014-dfighter
This commit is contained in:
parent
ec86d0381b
commit
e182e25e07
2 changed files with 19 additions and 7 deletions
|
@ -149,11 +149,16 @@ namespace NLGUI
|
|||
}
|
||||
else
|
||||
if( name == "text_posref" )
|
||||
{
|
||||
std::string pr;
|
||||
pr = CInterfaceElement::HotSpotToString( _TextPosRef );
|
||||
return pr;
|
||||
}
|
||||
else
|
||||
if( name == "text_parent_posref" )
|
||||
{
|
||||
std::string pr;
|
||||
pr = CInterfaceElement::HotSpotToString( _TextParentPosRef );
|
||||
pr += " ";
|
||||
pr += CInterfaceElement::HotSpotToString( _TextPosRef );
|
||||
return pr;
|
||||
}
|
||||
else
|
||||
|
@ -324,10 +329,13 @@ namespace NLGUI
|
|||
else
|
||||
if( name == "text_posref" )
|
||||
{
|
||||
THotSpot parent, posref;
|
||||
CInterfaceElement::convertHotSpotCouple( value.c_str(), parent, posref );
|
||||
_TextPosRef = posref;
|
||||
_TextParentPosRef = parent;
|
||||
_TextPosRef = convertHotSpot( value.c_str() );
|
||||
return;
|
||||
}
|
||||
else
|
||||
if( name == "text_parent_posref" )
|
||||
{
|
||||
_TextParentPosRef = convertHotSpot( value.c_str() );
|
||||
return;
|
||||
}
|
||||
else
|
||||
|
|
|
@ -325,7 +325,11 @@ namespace GUIEditor
|
|||
e->setProperty( propName.toUtf8().constData(), v );
|
||||
}
|
||||
else
|
||||
if( ( propName == "posref" ) || ( propName == "parentposref" ) )
|
||||
if( ( propName == "posref" ) ||
|
||||
( propName == "parentposref" ) ||
|
||||
( propName == "text_posref" ) ||
|
||||
( propName == "text_parent_posref" )
|
||||
)
|
||||
{
|
||||
CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
|
||||
if( e == NULL )
|
||||
|
|
Loading…
Reference in a new issue