mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 15:11:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'minimal_element_leak' into 'master'

Browse source 
Minimal solution to UI Element leak

See merge request OpenMW/openmw!2770
This commit is contained in:
psi29a 2023-02-26 14:57:30 +00:00
commit 2b9f962f7c
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/lua_ui/element.cpp
View file

@ -189,8 +189,8 @@ namespace LuaUi
assert(!mRoot); assert(!mRoot);
if (!mRoot) if (!mRoot)
{ {
mRoot = createWidget(mLayout, 0); mRoot = createWidget(layout(), 0);
mLayer = setLayer(mRoot, mLayout); mLayer = setLayer(mRoot, layout());
updateAttachment(); updateAttachment();
} }
} }
@ -199,16 +199,16 @@ namespace LuaUi
{ {
if (mRoot && mUpdate) if (mRoot && mUpdate)
{ {
if (mRoot->widget()->getTypeName() != widgetType(mLayout)) if (mRoot->widget()->getTypeName() != widgetType(layout()))
{ {
destroyWidget(mRoot); destroyWidget(mRoot);
mRoot = createWidget(mLayout, 0); mRoot = createWidget(layout(), 0);
} }
else else
{ {
updateWidget(mRoot, mLayout, 0); updateWidget(mRoot, layout(), 0);
} }
mLayer = setLayer(mRoot, mLayout); mLayer = setLayer(mRoot, layout());
updateAttachment(); updateAttachment();
} }
mUpdate = false; mUpdate = false;
@ -216,9 +216,11 @@ namespace LuaUi
void Element::destroy() void Element::destroy()
{ {
if (mRoot) if (!mRoot)
destroyWidget(mRoot); return;
destroyWidget(mRoot);
mRoot = nullptr; mRoot = nullptr;
mLayout = sol::make_object(mLayout.lua_state(), sol::nil);
sAllElements.erase(this); sAllElements.erase(this);
} }

3
components/lua_ui/element.hpp
View file

@ -18,7 +18,7 @@ namespace LuaUi
WidgetExtension* mRoot; WidgetExtension* mRoot;
WidgetExtension* mAttachedTo; WidgetExtension* mAttachedTo;
sol::table mLayout; sol::object mLayout;
std::string mLayer; std::string mLayer;
bool mUpdate; bool mUpdate;
bool mDestroy; bool mDestroy;
@ -36,6 +36,7 @@ namespace LuaUi
private: private:
Element(sol::table layout); Element(sol::table layout);
sol::table layout() { return mLayout.as<sol::table>(); }
static std::map<Element*, std::shared_ptr<Element>> sAllElements; static std::map<Element*, std::shared_ptr<Element>> sAllElements;
void updateAttachment(); void updateAttachment();
}; };

1
files/lua_api/openmw/ui.lua
View file

@ -239,6 +239,7 @@
--- ---
-- Access or replace the element's layout -- Access or replace the element's layout
-- Note: Is reset to `nil` on `destroy`
-- @field [parent=#Element] #Layout layout -- @field [parent=#Element] #Layout layout
--- ---