sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sdk/Widgets: Make the canvas aware of itself as a widget

Browse Source
This commit is contained in:
Lynix
2017-01-18 23:35:43 +01:00
parent c1dfc5c4b8
commit 36bcdcdb8c
5 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SDK/include/NDK/Canvas.inl
View File

@@ -12,6 +12,10 @@ namespace Ndk
m_world(std::move(world))
{
m_canvas = this;
m_widgetParent = nullptr;
// Widgetception
m_canvasIndex = m_canvas->RegisterWidget(this);
m_keyPressedSlot.Connect(eventHandler.OnKeyPressed, this, &Canvas::OnKeyPressed);
m_keyReleasedSlot.Connect(eventHandler.OnKeyReleased, this, &Canvas::OnKeyReleased);
@@ -20,12 +24,17 @@ namespace Ndk
m_mouseMovedSlot.Connect(eventHandler.OnMouseMoved, this, &Canvas::OnMouseMoved);
m_mouseLeftSlot.Connect(eventHandler.OnMouseLeft, this, &Canvas::OnMouseLeft);
m_textEnteredSlot.Connect(eventHandler.OnTextEntered, this, &Canvas::OnTextEntered);
SetPadding(0.f, 0.f, 0.f, 0.f);
}
inline Canvas::~Canvas()
{
// Destroy children explicitly because they signal us when getting destroyed, and that can't happend after our own destruction
// Destroy children explicitly because they signal us when getting destroyed, and that can't happen after our own destruction
DestroyChildren();
// Prevent our parent from trying to call us
m_canvasIndex = std::numeric_limits<std::size_t>::max();
}
inline const WorldHandle& Canvas::GetWorld() const