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

SDK/TextAreaWidget: Fix cursor handling

This commit is contained in:
Lynix 2016-12-03 00:39:19 +01:00
parent 1794c83a32
commit d28dab2e36
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,7 @@ namespace Ndk
break; break;
} }
std::size_t upperLimit = (line != lineCount - 1) ? m_drawer.GetLine(line + 1).glyphIndex : glyphCount; std::size_t upperLimit = (line != lineCount - 1) ? m_drawer.GetLine(line + 1).glyphIndex : glyphCount + 1;
upperLimit = std::min(upperLimit, glyphCount);
std::size_t i = m_drawer.GetLine(line).glyphIndex; std::size_t i = m_drawer.GetLine(line).glyphIndex;
for (; i < upperLimit - 1; ++i) for (; i < upperLimit - 1; ++i)
@ -95,8 +94,21 @@ namespace Ndk
line = i; line = i;
} }
Nz::Rectf bounds = m_drawer.GetGlyph(m_cursorPosition).bounds; const auto& lineInfo = m_drawer.GetLine(line);
m_cursorEntity->GetComponent<Ndk::NodeComponent>().SetPosition(bounds.x, m_drawer.GetLine(line).bounds.y);
std::size_t glyphCount = m_drawer.GetGlyphCount();
float position;
if (glyphCount > 0 && lineInfo.glyphIndex < m_cursorPosition)
{
const auto& glyph = m_drawer.GetGlyph(std::min(m_cursorPosition, glyphCount - 1));
position = glyph.bounds.x;
if (m_cursorPosition >= glyphCount)
position += glyph.bounds.width;
}
else
position = 0.f;
m_cursorEntity->GetComponent<Ndk::NodeComponent>().SetPosition(position, lineInfo.bounds.y);
} }
void TextAreaWidget::OnMouseEnter() void TextAreaWidget::OnMouseEnter()