mirror of
https://github.com/OpenMW/openmw.git
synced 2026-01-23 08:01:06 +00:00
Merge branch 'savetheelements' into 'master'
Detach elements from child before destroying it Closes #8802 See merge request OpenMW/openmw!5036
This commit is contained in:
commit
e68eb90348
1 changed files with 11 additions and 8 deletions
|
|
@ -49,14 +49,6 @@ namespace LuaUi
|
|||
MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
|
||||
}
|
||||
|
||||
void destroyChild(WidgetExtension* ext)
|
||||
{
|
||||
if (!ext->isRoot())
|
||||
destroyWidget(ext);
|
||||
else
|
||||
ext->detachFromParent();
|
||||
}
|
||||
|
||||
void detachElements(WidgetExtension* ext)
|
||||
{
|
||||
auto predicate = [](WidgetExtension* child) {
|
||||
|
|
@ -69,6 +61,17 @@ namespace LuaUi
|
|||
ext->detachTemplateChildrenIf(predicate);
|
||||
}
|
||||
|
||||
void destroyChild(WidgetExtension* ext)
|
||||
{
|
||||
if (!ext->isRoot())
|
||||
{
|
||||
detachElements(ext);
|
||||
destroyWidget(ext);
|
||||
}
|
||||
else
|
||||
ext->detachFromParent();
|
||||
}
|
||||
|
||||
void destroyRoot(WidgetExtension* ext)
|
||||
{
|
||||
detachElements(ext);
|
||||
|
|
|
|||
Loading…
Reference in a new issue