aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-30 23:45:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

text posref is now an enum too.

Browse source
This commit is contained in:
dfighter1985 2014-06-27 00:07:44 +02:00
parent b108dd7d34
commit 3ac5ecc59b
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
code/nel/src/gui/ctrl_text_button.cpp
View file

@ -149,11 +149,16 @@ namespace NLGUI
} }
else else
if( name == "text_posref" ) if( name == "text_posref" )
{
std::string pr;
pr = CInterfaceElement::HotSpotToString( _TextPosRef );
return pr;
}
else
if( name == "text_parent_posref" )
{ {
std::string pr; std::string pr;
pr = CInterfaceElement::HotSpotToString( _TextParentPosRef ); pr = CInterfaceElement::HotSpotToString( _TextParentPosRef );
pr += " ";
pr += CInterfaceElement::HotSpotToString( _TextPosRef );
return pr; return pr;
} }
else else
@ -324,10 +329,13 @@ namespace NLGUI
else else
if( name == "text_posref" ) if( name == "text_posref" )
{ {
THotSpot parent, posref; _TextPosRef = convertHotSpot( value.c_str() );
CInterfaceElement::convertHotSpotCouple( value.c_str(), parent, posref ); return;
_TextPosRef = posref; }
_TextParentPosRef = parent; else
if( name == "text_parent_posref" )
{
_TextParentPosRef = convertHotSpot( value.c_str() );
return; return;
} }
else else

6
code/studio/src/plugins/gui_editor/property_browser_ctrl.cpp
View file

@ -325,7 +325,11 @@ namespace GUIEditor
e->setProperty( propName.toUtf8().constData(), v ); e->setProperty( propName.toUtf8().constData(), v );
} }
else else
if( ( propName == "posref" ) || ( propName == "parentposref" ) ) if( ( propName == "posref" ) ||
( propName == "parentposref" ) ||
( propName == "text_posref" ) ||
( propName == "text_parent_posref" )
)
{ {
CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement ); CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
if( e == NULL ) if( e == NULL )