Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94)
Just too lazy to push directly
This commit is contained in:
commit
606f0f483f
3 changed files with 44 additions and 5 deletions
code
nel
studio/src/plugins/gui_editor
|
@ -491,8 +491,10 @@ namespace NLGUI
|
|||
void setEditorSelected( bool b ){ editorSelected = b; }
|
||||
bool isEditorSelected() const{ return editorSelected; }
|
||||
|
||||
void parsePosParent( const std::string &id );
|
||||
void setPosParent( const std::string &id );
|
||||
void getPosParent( std::string &id ) const;
|
||||
void parseSizeParent( const std::string &id );
|
||||
void setSizeParent( const std::string &id );
|
||||
void getSizeParent( std::string &id ) const;
|
||||
|
||||
|
|
|
@ -388,13 +388,13 @@ namespace NLGUI
|
|||
ptr = (char*) xmlGetProp( cur, (xmlChar*)"posparent" );
|
||||
if (ptr)
|
||||
{
|
||||
setPosParent( std::string( (const char*)ptr ) );
|
||||
parsePosParent( (const char*)ptr );
|
||||
}
|
||||
|
||||
ptr = (char*) xmlGetProp( cur, (xmlChar*)"sizeparent" );
|
||||
if (ptr)
|
||||
{
|
||||
setSizeParent( std::string( (const char*)ptr ) );
|
||||
parseSizeParent( (const char*)ptr );
|
||||
}
|
||||
|
||||
ptr = (char*) xmlGetProp (cur, (xmlChar*)"sizeref");
|
||||
|
@ -1532,6 +1532,26 @@ namespace NLGUI
|
|||
return false;
|
||||
}
|
||||
|
||||
void CInterfaceElement::parsePosParent( const std::string &id )
|
||||
{
|
||||
CInterfaceElement *p = getParent();
|
||||
|
||||
if( ( id == "parent" ) || ( id.empty() ) )
|
||||
{
|
||||
setParentPos( p );
|
||||
return;
|
||||
}
|
||||
|
||||
std::string ppId;
|
||||
|
||||
if( p != NULL )
|
||||
ppId = p->getId() + ":" + id;
|
||||
else
|
||||
ppId = std::string( "ui:" ) + id;
|
||||
|
||||
CWidgetManager::getInstance()->getParser()->addParentPositionAssociation( this, ppId );
|
||||
}
|
||||
|
||||
void CInterfaceElement::setPosParent( const std::string &id )
|
||||
{
|
||||
// Parent or empty id simply means the group parent
|
||||
|
@ -1596,6 +1616,26 @@ namespace NLGUI
|
|||
id = p->getId();
|
||||
}
|
||||
|
||||
void CInterfaceElement::parseSizeParent( const std::string &id )
|
||||
{
|
||||
CInterfaceElement *p = getParent();
|
||||
|
||||
if( ( id == "parent" ) || ( id.empty() ) )
|
||||
{
|
||||
setParentSize( p );
|
||||
return;
|
||||
}
|
||||
|
||||
std::string spId;
|
||||
|
||||
if( p != NULL )
|
||||
spId = p->getId() + ":" + id;
|
||||
else
|
||||
spId = std::string( "ui:" ) + id;
|
||||
|
||||
CWidgetManager::getInstance()->getParser()->addParentSizeAssociation( this, spId );
|
||||
}
|
||||
|
||||
void CInterfaceElement::setSizeParent( const std::string &id )
|
||||
{
|
||||
// Parent or empty id simply means the group parent
|
||||
|
|
|
@ -713,9 +713,6 @@ namespace GUIEditor
|
|||
{
|
||||
std::string j = element->getProperty( prop.propName );
|
||||
|
||||
if( j.empty() )
|
||||
return;
|
||||
|
||||
QtProperty *pp = textureMgr->addProperty( prop.propName.c_str() );
|
||||
if( pp == NULL )
|
||||
return;
|
||||
|
|
Loading…
Reference in a new issue