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

SDK/TextAreaWidget: Preferred size will now adjust to content

This commit is contained in:
Lynix 2019-07-05 22:24:49 +02:00
parent 2d4dd7a8ab
commit b214f48225
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,10 @@ namespace Ndk
m_textEntity = CreateEntity(); m_textEntity = CreateEntity();
m_textEntity->AddComponent<GraphicsComponent>().Attach(m_textSprite); m_textEntity->AddComponent<GraphicsComponent>().Attach(m_textSprite);
m_textEntity->AddComponent<NodeComponent>().SetParent(this);
m_textEntity->GetComponent<NodeComponent>().SetPosition(5.f, 3.f); auto& textNode = m_textEntity->AddComponent<NodeComponent>();
textNode.SetParent(this);
textNode.SetPosition(5.f, 3.f);
SetCursor(Nz::SystemCursor_Text); SetCursor(Nz::SystemCursor_Text);
SetCharacterSize(GetCharacterSize()); //< Actualize minimum / preferred size SetCharacterSize(GetCharacterSize()); //< Actualize minimum / preferred size
@ -73,6 +75,7 @@ namespace Ndk
} }
m_textSprite->Update(m_drawer); m_textSprite->Update(m_drawer);
SetPreferredSize(Nz::Vector2f(m_textSprite->GetBoundingVolume().obb.localBox.GetLengths()));
OnTextChanged(this, m_text); OnTextChanged(this, m_text);
} }
@ -163,7 +166,6 @@ namespace Ndk
Nz::Vector2f size = { float(spaceAdvance), float(lineHeight) + 5.f }; Nz::Vector2f size = { float(spaceAdvance), float(lineHeight) + 5.f };
SetMinimumSize(size); SetMinimumSize(size);
SetPreferredSize({ size.x * 6.f, size.y });
} }
void TextAreaWidget::Write(const Nz::String& text, std::size_t glyphPosition) void TextAreaWidget::Write(const Nz::String& text, std::size_t glyphPosition)
@ -606,6 +608,7 @@ namespace Ndk
} }
m_textSprite->Update(m_drawer); m_textSprite->Update(m_drawer);
SetPreferredSize(Nz::Vector2f(m_textSprite->GetBoundingVolume().obb.localBox.GetLengths()));
SetCursorPosition(m_cursorPositionBegin); //< Refresh cursor position (prevent it from being outside of the text) SetCursorPosition(m_cursorPositionBegin); //< Refresh cursor position (prevent it from being outside of the text)
} }