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

CHANGED: #1471 CCtrlTextButton created CViewText shouldn't be serialized.

Browse source 
--HG--
branch : gsoc2012-gui-editor
This commit is contained in:
dfighter1985 2012-08-15 18:12:33 +02:00
parent 0e33091e27
commit 94a6fe7595
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -508,6 +508,7 @@ namespace NLGUI
else else
_ViewText= new CViewText(CViewBase::TCtorParam()); _ViewText= new CViewText(CViewBase::TCtorParam());
_ViewText->setId(_Id+"_text"); _ViewText->setId(_Id+"_text");
_ViewText->setSerializable( false );
_ViewText->parseTextOptions(cur); _ViewText->parseTextOptions(cur);
_ViewText->setAvoidResizeParent(avoidResizeParent()); _ViewText->setAvoidResizeParent(avoidResizeParent());
if(_IsViewTextId) if(_IsViewTextId)

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

@ -1353,8 +1353,7 @@ namespace NLGUI
if (parentGroup->getElement(view->getId()) != NULL) if (parentGroup->getElement(view->getId()) != NULL)
{ {
// Remove old groupe and replace // Remove old groupe and replace
// TODO: Don't save widgets created by complex widgets if ( reload )
if ( true /*reload*/)
parentGroup->delElement (view->getId()); parentGroup->delElement (view->getId());
else else
{ {