diff --git a/ChangeLog.md b/ChangeLog.md index 92f0fa8da..a0bd88f53 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -308,6 +308,7 @@ Nazara Development Kit: - Added Entity::DropComponent which detaches a component without necessarily destroying it - ⚠ ConstraintComponent2D has been reworked to handle entity destruction and remove constraints at will - Fixed crash when pressing up/down key with no history in the console +- (Rich)TextAreaWidget text style is now alterable # 0.4: diff --git a/SDK/include/NDK/Widgets/RichTextAreaWidget.hpp b/SDK/include/NDK/Widgets/RichTextAreaWidget.hpp index 74a6d187e..280ed9651 100644 --- a/SDK/include/NDK/Widgets/RichTextAreaWidget.hpp +++ b/SDK/include/NDK/Widgets/RichTextAreaWidget.hpp @@ -31,12 +31,14 @@ namespace Ndk inline Nz::Font* GetTextFont() const; inline const Nz::Color& GetTextOutlineColor() const; inline float GetTextOutlineThickness() const; + inline Nz::TextStyleFlags GetTextStyle() const; inline void SetCharacterSize(unsigned int characterSize); inline void SetTextColor(const Nz::Color& color); inline void SetTextFont(Nz::FontRef font); inline void SetTextOutlineColor(const Nz::Color& color); inline void SetTextOutlineThickness(float thickness); + inline void SetTextStyle(Nz::TextStyleFlags style); void Write(const Nz::String& text, std::size_t glyphPosition) override; diff --git a/SDK/include/NDK/Widgets/RichTextAreaWidget.inl b/SDK/include/NDK/Widgets/RichTextAreaWidget.inl index 9d9e2650c..01f2dd7a3 100644 --- a/SDK/include/NDK/Widgets/RichTextAreaWidget.inl +++ b/SDK/include/NDK/Widgets/RichTextAreaWidget.inl @@ -31,6 +31,11 @@ namespace Ndk return m_drawer.GetDefaultOutlineThickness(); } + inline Nz::TextStyleFlags RichTextAreaWidget::GetTextStyle() const + { + return m_drawer.GetDefaultStyle(); + } + inline void RichTextAreaWidget::SetCharacterSize(unsigned int characterSize) { m_drawer.SetDefaultCharacterSize(characterSize); @@ -55,4 +60,9 @@ namespace Ndk { m_drawer.SetDefaultOutlineThickness(thickness); } + + inline void RichTextAreaWidget::SetTextStyle(Nz::TextStyleFlags style) + { + m_drawer.SetDefaultStyle(style); + } } diff --git a/SDK/include/NDK/Widgets/TextAreaWidget.hpp b/SDK/include/NDK/Widgets/TextAreaWidget.hpp index bd81ec8e6..dbbac6dad 100644 --- a/SDK/include/NDK/Widgets/TextAreaWidget.hpp +++ b/SDK/include/NDK/Widgets/TextAreaWidget.hpp @@ -34,6 +34,7 @@ namespace Ndk inline Nz::Font* GetTextFont() const; inline const Nz::Color& GetTextOulineColor() const; inline float GetTextOulineThickness() const; + inline Nz::TextStyleFlags GetTextStyle() const; void SetCharacterSize(unsigned int characterSize); inline void SetText(const Nz::String& text); @@ -41,6 +42,7 @@ namespace Ndk inline void SetTextFont(Nz::FontRef font); inline void SetTextOutlineColor(const Nz::Color& color); inline void SetTextOutlineThickness(float thickness); + inline void SetTextStyle(Nz::TextStyleFlags style); using AbstractTextAreaWidget::Write; void Write(const Nz::String& text, std::size_t glyphPosition) override; diff --git a/SDK/include/NDK/Widgets/TextAreaWidget.inl b/SDK/include/NDK/Widgets/TextAreaWidget.inl index aeb7f6914..008cb77fa 100644 --- a/SDK/include/NDK/Widgets/TextAreaWidget.inl +++ b/SDK/include/NDK/Widgets/TextAreaWidget.inl @@ -41,6 +41,11 @@ namespace Ndk return m_drawer.GetOutlineThickness(); } + inline Nz::TextStyleFlags TextAreaWidget::GetTextStyle() const + { + return m_drawer.GetStyle(); + } + inline void TextAreaWidget::SetText(const Nz::String& text) { m_text = text; @@ -76,4 +81,11 @@ namespace Ndk UpdateDisplayText(); } + + inline void TextAreaWidget::SetTextStyle(Nz::TextStyleFlags style) + { + m_drawer.SetStyle(style); + + UpdateDisplayText(); + } }