CHANGED: #1471 Squashed a bug that prevented many widgets from being serialized right. Therefore preventing correct display when loading the saved XML.
--HG-- branch : gsoc2012-gui-editor
This commit is contained in:
parent
503b9c4234
commit
ceba5457c5
1 changed files with 8 additions and 4 deletions
|
@ -1956,10 +1956,10 @@ namespace NLGUI
|
||||||
|
|
||||||
|
|
||||||
// Clear all structures used only for init
|
// Clear all structures used only for init
|
||||||
NLMISC::contReset (_ParentPositionsMap);
|
//NLMISC::contReset (_ParentPositionsMap);
|
||||||
NLMISC::contReset (_ParentSizesMap);
|
//NLMISC::contReset (_ParentSizesMap);
|
||||||
NLMISC::contReset (_ParentSizesMaxMap);
|
//NLMISC::contReset (_ParentSizesMaxMap);
|
||||||
NLMISC::contReset (_LuaClassAssociation);
|
//NLMISC::contReset (_LuaClassAssociation);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2553,6 +2553,10 @@ namespace NLGUI
|
||||||
CWidgetManager::getInstance()->removeAllMasterGroups();
|
CWidgetManager::getInstance()->removeAllMasterGroups();
|
||||||
_StyleMap.clear();
|
_StyleMap.clear();
|
||||||
_CtrlSheetSelection.deleteGroups();
|
_CtrlSheetSelection.deleteGroups();
|
||||||
|
NLMISC::contReset (_ParentPositionsMap);
|
||||||
|
NLMISC::contReset (_ParentSizesMap);
|
||||||
|
NLMISC::contReset (_ParentSizesMaxMap);
|
||||||
|
NLMISC::contReset (_LuaClassAssociation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue