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

Merge branch 'master' into console-widget

Browse Source
This commit is contained in:
Lynix
2019-07-03 22:31:17 +02:00
parent 1c0a234d04 c23248c564
commit 2c3bf482de
111 changed files with 2264 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,8 @@ namespace Ndk
inline std::size_t GetGlyphIndex(const Nz::Vector2ui& cursorPosition) const;
inline const Nz::String& GetText() const;
inline const Nz::Color& GetTextColor() const;
inline const Nz::Color& GetTextOulineColor() const;
inline float GetTextOulineThickness() const;
Nz::Vector2ui GetHoveredGlyph(float x, float y) const;
@@ -71,6 +73,8 @@ namespace Ndk
inline void SetSelection(Nz::Vector2ui fromPosition, Nz::Vector2ui toPosition);
inline void SetText(const Nz::String& text);
inline void SetTextColor(const Nz::Color& text);
inline void SetTextOutlineColor(const Nz::Color& color);
inline void SetTextOutlineThickness(float thickness);
inline void Write(const Nz::String& text);
inline void Write(const Nz::String& text, const Nz::Vector2ui& glyphPosition);

26
SDK/include/NDK/Widgets/TextAreaWidget.inl
View File

@@ -107,6 +107,16 @@ namespace Ndk
return m_drawer.GetColor();
}
inline const Nz::Color& TextAreaWidget::GetTextOulineColor() const
{
return m_drawer.GetOutlineColor();
}
inline float TextAreaWidget::GetTextOulineThickness() const
{
return m_drawer.GetOutlineThickness();
}
inline bool TextAreaWidget::HasSelection() const
{
return m_cursorPositionBegin != m_cursorPositionEnd;
@@ -246,7 +256,21 @@ namespace Ndk
{
m_drawer.SetColor(text);
m_textSprite->Update(m_drawer);
UpdateDisplayText();
}
inline void TextAreaWidget::SetTextOutlineColor(const Nz::Color& color)
{
m_drawer.SetOutlineColor(color);
UpdateDisplayText();
}
inline void TextAreaWidget::SetTextOutlineThickness(float thickness)
{
m_drawer.SetOutlineThickness(thickness);
UpdateDisplayText();
}
inline void TextAreaWidget::Write(const Nz::String& text)