mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 23:06:41 +00:00
Code Issues Releases Wiki Activity

Clean up

Browse source
This commit is contained in:
uramer 2022-01-30 15:50:04 +01:00
parent 01d65a14f1
commit 7f796d148e
3 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/lua_ui/util.cpp
View file

@ -36,7 +36,6 @@ namespace LuaUi
{ "LuaTextEdit", "TextEdit" }, { "LuaTextEdit", "TextEdit" },
{ "LuaWindow", "Window" }, { "LuaWindow", "Window" },
{ "LuaImage", "Image" }, { "LuaImage", "Image" },
{ "LuaContainer", "Container" },
}; };
return types; return types;
} }

6
components/lua_ui/widget.cpp
View file

@ -65,7 +65,7 @@ namespace LuaUi
mWidget->eventKeySetFocus.clear(); mWidget->eventKeySetFocus.clear();
mWidget->eventKeyLostFocus.clear(); mWidget->eventKeyLostFocus.clear();
mOnSizeChange.reset(); mOnCoordChange.reset();
for (WidgetExtension* w : mChildren) for (WidgetExtension* w : mChildren)
w->deinitialize(); w->deinitialize();
@ -212,11 +212,7 @@ namespace LuaUi
if (oldCoord != newCoord) if (oldCoord != newCoord)
mWidget->setCoord(newCoord); mWidget->setCoord(newCoord);
if (oldCoord.size() != newCoord.size()) if (oldCoord.size() != newCoord.size())
{
updateChildrenCoord(); updateChildrenCoord();
if (mOnSizeChange.has_value())
mOnSizeChange.value()(newCoord.size());
}
if (oldCoord != newCoord && mOnCoordChange.has_value()) if (oldCoord != newCoord && mOnCoordChange.has_value())
mOnCoordChange.value()(this, newCoord); mOnCoordChange.value()(this, newCoord);
} }

6
components/lua_ui/widget.hpp
View file

@ -62,11 +62,6 @@ namespace LuaUi
mOnCoordChange = callback; mOnCoordChange = callback;
} }
void onSizeChange(const std::optional<std::function<void(MyGUI::IntSize)>>& callback)
{
mOnSizeChange = callback;
}
protected: protected:
virtual void initialize(); virtual void initialize();
sol::table makeTable() const; sol::table makeTable() const;
@ -137,7 +132,6 @@ namespace LuaUi
void focusLoss(MyGUI::Widget*, MyGUI::Widget*); void focusLoss(MyGUI::Widget*, MyGUI::Widget*);
std::optional<std::function<void(WidgetExtension*, MyGUI::IntCoord)>> mOnCoordChange; std::optional<std::function<void(WidgetExtension*, MyGUI::IntCoord)>> mOnCoordChange;
std::optional<std::function<void(MyGUI::IntSize)>> mOnSizeChange;
}; };
class LuaWidget : public MyGUI::Widget, public WidgetExtension class LuaWidget : public MyGUI::Widget, public WidgetExtension