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

Sdk: Fix segfault when deleting hovered widget

Browse Source
This commit is contained in:
Jérôme Leclercq
2017-10-06 14:12:18 +02:00
parent 1f48ec4099
commit be8cc08ba9
5 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SDK/include/NDK/Canvas.hpp
View File

@@ -39,7 +39,7 @@ namespace Ndk
std::size_t RegisterWidget(BaseWidget* widget);
inline void SetKeyboardOwner(BaseWidget* widget);
inline void SetKeyboardOwner(std::size_t canvasIndex);
void UnregisterWidget(std::size_t index);
@@ -67,10 +67,10 @@ namespace Ndk
NazaraSlot(Nz::EventHandler, OnMouseLeft, m_mouseLeftSlot);
NazaraSlot(Nz::EventHandler, OnTextEntered, m_textEnteredSlot);
std::size_t m_keyboardOwner;
std::size_t m_hoveredWidget;
std::vector<WidgetBox> m_widgetBoxes;
Nz::CursorControllerHandle m_cursorController;
const WidgetBox* m_hoveredWidget;
BaseWidget* m_keyboardOwner;
WorldHandle m_world;
};
}