Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

text posref is now an enum too.

Browse source 
--HG--
branch : gsoc2014-dfighter
This commit is contained in:
dfighter1985 2014-06-27 00:07:44 +02:00
parent ec86d0381b
commit e182e25e07
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
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

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 );
}
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 )