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

Fix some stuff

This commit is contained in:
Lynix 2019-07-07 00:24:02 +02:00
parent 8457cb4df7
commit d8f6af3191
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,6 @@ namespace Ndk
void AppendText(const Nz::String& text); void AppendText(const Nz::String& text);
void UpdateTextSprite();
inline void Clear(); inline void Clear();
//virtual TextAreaWidget* Clone() const = 0; //virtual TextAreaWidget* Clone() const = 0;
@ -115,6 +113,7 @@ namespace Ndk
void RefreshCursor(); void RefreshCursor();
void UpdateDisplayText(); void UpdateDisplayText();
void UpdateTextSprite();
CharacterFilter m_characterFilter; CharacterFilter m_characterFilter;
EchoMode m_echoMode; EchoMode m_echoMode;

3
SDK/src/NDK/Widgets/TextAreaWidget.cpp
View File

@ -168,7 +168,7 @@ namespace Ndk
break; break;
} }
return Nz::Vector2ui(i - firstLineGlyph, line); return Nz::Vector2ui(Nz::Vector2<std::size_t>(i - firstLineGlyph, line));
} }
return Nz::Vector2ui::Zero(); return Nz::Vector2ui::Zero();
@ -572,7 +572,6 @@ namespace Ndk
*glyphIndex = cursorGlyph; *glyphIndex = cursorGlyph;
std::size_t glyphCount = m_drawer.GetGlyphCount(); std::size_t glyphCount = m_drawer.GetGlyphCount();
float position;
if (glyphCount > 0 && lineInfo.glyphIndex < cursorGlyph) if (glyphCount > 0 && lineInfo.glyphIndex < cursorGlyph)
{ {
const auto& glyph = m_drawer.GetGlyph(std::min(cursorGlyph, glyphCount - 1)); const auto& glyph = m_drawer.GetGlyph(std::min(cursorGlyph, glyphCount - 1));