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

Sdk/Canvas: Rename widgetbox to widgetentry

Browse Source
This commit is contained in:
Jérôme Leclercq
2017-11-23 13:54:58 +01:00
parent c435923533
commit 4116984f9f
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ namespace Ndk
void OnEventKeyReleased(const Nz::EventHandler* eventHandler, const Nz::WindowEvent::KeyEvent& event);
void OnEventTextEntered(const Nz::EventHandler* eventHandler, const Nz::WindowEvent::TextEvent& event);
struct WidgetBox
struct WidgetEntry
{
BaseWidget* widget;
Nz::Boxf box;
@@ -73,7 +73,7 @@ namespace Ndk
std::size_t m_keyboardOwner;
std::size_t m_hoveredWidget;
std::vector<WidgetBox> m_widgetBoxes;
std::vector<WidgetEntry> m_widgetEntries;
Nz::CursorControllerHandle m_cursorController;
WorldHandle m_world;
};

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

@@ -59,7 +59,7 @@ namespace Ndk
inline void Canvas::NotifyWidgetBoxUpdate(std::size_t index)
{
WidgetBox& entry = m_widgetBoxes[index];
WidgetEntry& entry = m_widgetEntries[index];
Nz::Vector3f pos = entry.widget->GetPosition();
Nz::Vector2f size = entry.widget->GetContentSize();
@@ -69,7 +69,7 @@ namespace Ndk
inline void Canvas::NotifyWidgetCursorUpdate(std::size_t index)
{
WidgetBox& entry = m_widgetBoxes[index];
WidgetEntry& entry = m_widgetEntries[index];
entry.cursor = entry.widget->GetCursor();
if (m_cursorController && m_hoveredWidget == index)
@@ -81,12 +81,12 @@ namespace Ndk
if (m_keyboardOwner != canvasIndex)
{
if (m_keyboardOwner != InvalidCanvasIndex)
m_widgetBoxes[m_keyboardOwner].widget->OnFocusLost();
m_widgetEntries[m_keyboardOwner].widget->OnFocusLost();
m_keyboardOwner = canvasIndex;
if (m_keyboardOwner != InvalidCanvasIndex)
m_widgetBoxes[m_keyboardOwner].widget->OnFocusReceived();
m_widgetEntries[m_keyboardOwner].widget->OnFocusReceived();
}
}
}

1
SDK/include/NDK/Widgets/TextAreaWidget.hpp
View File

@@ -73,6 +73,7 @@ namespace Ndk
private:
void Layout() override;
bool IsFocusable() const override;
void OnFocusLost() override;
void OnFocusReceived() override;
void OnKeyPressed(const Nz::WindowEvent::KeyEvent& key) override;