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

The editor probably shouldn't crash when adding textbutton widget.

Browse source 
--HG--
branch : gsoc2012-gui-editor
This commit is contained in:
dfighter1985 2013-05-10 02:10:18 +02:00
parent 9042de4ab2
commit 25195fce4c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -886,6 +886,14 @@ namespace NLGUI
{ {
_Setuped= true; _Setuped= true;
if( _ViewText == NULL )
{
CViewBase *v = CWidgetManager::getInstance()->getParser()->createClass( "text" );
nlassert( v != NULL );
_ViewText = dynamic_cast< CViewText* >( v );
_ViewText->setText( ucstring( "text" ) );
}
// setup the viewText and add to parent // setup the viewText and add to parent
_ViewText->setParent (getParent()); _ViewText->setParent (getParent());
_ViewText->setParentPos (this); _ViewText->setParentPos (this);

3
code/nel/src/gui/widget_manager.cpp
View file

@ -3289,6 +3289,7 @@ namespace NLGUI
return NULL; return NULL;
v->setId( std::string( g->getId() + ":" + widgetName ) ); v->setId( std::string( g->getId() + ":" + widgetName ) );
v->setParent( g );
if( v->isGroup() ) if( v->isGroup() )
g->addGroup( dynamic_cast< CInterfaceGroup* >( v ) ); g->addGroup( dynamic_cast< CInterfaceGroup* >( v ) );
@ -3298,8 +3299,6 @@ namespace NLGUI
else else
g->addView( v ); g->addView( v );
v->setParent( g );
notifyAdditionWatchers( v->getId() ); notifyAdditionWatchers( v->getId() );
return v; return v;