From d8f6af319148db111867982b5f511eec4dde2f65 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 7 Jul 2019 00:24:02 +0200 Subject: [PATCH] Fix some stuff --- SDK/include/NDK/Widgets/TextAreaWidget.hpp | 3 +-- SDK/src/NDK/Widgets/TextAreaWidget.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/SDK/include/NDK/Widgets/TextAreaWidget.hpp b/SDK/include/NDK/Widgets/TextAreaWidget.hpp index 223a3759f..c89f46884 100644 --- a/SDK/include/NDK/Widgets/TextAreaWidget.hpp +++ b/SDK/include/NDK/Widgets/TextAreaWidget.hpp @@ -28,8 +28,6 @@ namespace Ndk void AppendText(const Nz::String& text); - void UpdateTextSprite(); - inline void Clear(); //virtual TextAreaWidget* Clone() const = 0; @@ -115,6 +113,7 @@ namespace Ndk void RefreshCursor(); void UpdateDisplayText(); + void UpdateTextSprite(); CharacterFilter m_characterFilter; EchoMode m_echoMode; diff --git a/SDK/src/NDK/Widgets/TextAreaWidget.cpp b/SDK/src/NDK/Widgets/TextAreaWidget.cpp index 20395a2ed..3ab119a0a 100644 --- a/SDK/src/NDK/Widgets/TextAreaWidget.cpp +++ b/SDK/src/NDK/Widgets/TextAreaWidget.cpp @@ -168,7 +168,7 @@ namespace Ndk break; } - return Nz::Vector2ui(i - firstLineGlyph, line); + return Nz::Vector2ui(Nz::Vector2(i - firstLineGlyph, line)); } return Nz::Vector2ui::Zero(); @@ -572,7 +572,6 @@ namespace Ndk *glyphIndex = cursorGlyph; std::size_t glyphCount = m_drawer.GetGlyphCount(); - float position; if (glyphCount > 0 && lineInfo.glyphIndex < cursorGlyph) { const auto& glyph = m_drawer.GetGlyph(std::min(cursorGlyph, glyphCount - 1));