SDK: Add RichTextAreaWidget (WIP)

SDK/include/NDK/Console.hpp

@@ -24,6 +24,7 @@ namespace Nz
 
 namespace Ndk
 {
+	class AbstractTextAreaWidget;
 	class Console;
 	class Entity;
 	class ScrollAreaWidget;
@@ -59,7 +60,7 @@ namespace Ndk
 			NazaraSignal(OnCommand, Console* /*console*/, const Nz::String& /*command*/);
 
 		private:
-			void ExecuteInput(const TextAreaWidget* textArea, bool* ignoreDefaultAction);
+			void ExecuteInput(const AbstractTextAreaWidget* textArea, bool* ignoreDefaultAction);
 			void Layout() override;
 
 			struct Line

SDK/include/NDK/Widgets.hpp

@@ -5,6 +5,7 @@
 #ifndef NDK_WIDGETS_GLOBAL_HPP
 #define NDK_WIDGETS_GLOBAL_HPP
 
+#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
 #include <NDK/Widgets/BoxLayout.hpp>
 #include <NDK/Widgets/ButtonWidget.hpp>
 #include <NDK/Widgets/CheckboxWidget.hpp>
@@ -12,6 +13,7 @@
 #include <NDK/Widgets/ImageWidget.hpp>
 #include <NDK/Widgets/LabelWidget.hpp>
 #include <NDK/Widgets/ProgressBarWidget.hpp>
+#include <NDK/Widgets/RichTextAreaWidget.hpp>
 #include <NDK/Widgets/ScrollAreaWidget.hpp>
 #include <NDK/Widgets/TextAreaWidget.hpp>
 

SDK/include/NDK/Widgets/AbstractTextAreaWidget.hpp

@@ -0,0 +1,135 @@
+// Copyright (C) 2017 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequisites.hpp
+
+#pragma once
+
+#ifndef NDK_WIDGETS_ABSTRACTTEXTAREAWIDGET_HPP
+#define NDK_WIDGETS_ABSTRACTTEXTAREAWIDGET_HPP
+
+#include <Nazara/Graphics/TextSprite.hpp>
+#include <Nazara/Utility/AbstractTextDrawer.hpp>
+#include <NDK/BaseWidget.hpp>
+#include <NDK/Widgets/Enums.hpp>
+#include <functional>
+#include <vector>
+
+namespace Ndk
+{
+	class NDK_API AbstractTextAreaWidget : public BaseWidget
+	{
+		public:
+			using CharacterFilter = std::function<bool(char32_t)>;
+
+			AbstractTextAreaWidget(BaseWidget* parent);
+			AbstractTextAreaWidget(const AbstractTextAreaWidget&) = delete;
+			AbstractTextAreaWidget(AbstractTextAreaWidget&&) = default;
+			~AbstractTextAreaWidget() = default;
+
+			virtual void Clear();
+
+			//virtual TextAreaWidget* Clone() const = 0;
+
+			void EnableLineWrap(bool enable = true);
+			inline void EnableMultiline(bool enable = true);
+			inline void EnableTabWriting(bool enable = true);
+
+			inline void Erase(std::size_t glyphPosition);
+			virtual void Erase(std::size_t firstGlyph, std::size_t lastGlyph) = 0;
+			inline void EraseSelection();
+
+			inline const CharacterFilter& GetCharacterFilter() const;
+			inline const Nz::Vector2ui& GetCursorPosition() const;
+			inline Nz::Vector2ui GetCursorPosition(std::size_t glyphIndex) const;
+			inline EchoMode GetEchoMode() const;
+			inline std::size_t GetGlyphIndex() const;
+			inline std::size_t GetGlyphIndex(const Nz::Vector2ui& cursorPosition) const;
+			inline const Nz::String& GetText() const;
+
+			Nz::Vector2ui GetHoveredGlyph(float x, float y) const;
+
+			inline bool HasSelection() const;
+
+			inline bool IsLineWrapEnabled() const;
+			inline bool IsMultilineEnabled() const;
+			inline bool IsReadOnly() const;
+			inline bool IsTabWritingEnabled() const;
+
+			inline void MoveCursor(int offset);
+			inline void MoveCursor(const Nz::Vector2i& offset);
+
+			inline Nz::Vector2ui NormalizeCursorPosition(Nz::Vector2ui cursorPosition) const;
+
+			inline void SetCharacterFilter(CharacterFilter filter);
+			inline void SetCursorPosition(std::size_t glyphIndex);
+			inline void SetCursorPosition(Nz::Vector2ui cursorPosition);
+			inline void SetEchoMode(EchoMode echoMode);
+			inline void SetReadOnly(bool readOnly = true);
+			inline void SetSelection(Nz::Vector2ui fromPosition, Nz::Vector2ui toPosition);
+
+			inline void Write(const Nz::String& text);
+			inline void Write(const Nz::String& text, const Nz::Vector2ui& glyphPosition);
+			virtual void Write(const Nz::String& text, std::size_t glyphPosition) = 0;
+
+			AbstractTextAreaWidget& operator=(const AbstractTextAreaWidget&) = delete;
+			AbstractTextAreaWidget& operator=(AbstractTextAreaWidget&&) = default;
+
+			NazaraSignal(OnTextAreaCursorMove, const AbstractTextAreaWidget* /*textArea*/, Nz::Vector2ui* /*newCursorPosition*/);
+			NazaraSignal(OnTextAreaKeyBackspace, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaKeyDown, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaKeyEnd, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaKeyHome, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaKeyLeft, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaKeyReturn, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaKeyRight, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaKeyUp, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
+			NazaraSignal(OnTextAreaSelection, const AbstractTextAreaWidget* /*textArea*/, Nz::Vector2ui* /*start*/, Nz::Vector2ui* /*end*/);
+
+		protected:
+			virtual Nz::AbstractTextDrawer& GetTextDrawer() = 0;
+			virtual const Nz::AbstractTextDrawer& GetTextDrawer() const = 0;
+
+			void Layout() override;
+
+			virtual void HandleIndentation(bool add) = 0;
+			virtual void HandleSelectionIndentation(bool add) = 0;
+			virtual void HandleWordCursorMove(bool left) = 0;
+
+			bool IsFocusable() const override;
+			void OnFocusLost() override;
+			void OnFocusReceived() override;
+			bool OnKeyPressed(const Nz::WindowEvent::KeyEvent& key) override;
+			void OnKeyReleased(const Nz::WindowEvent::KeyEvent& key) override;
+			void OnMouseButtonPress(int /*x*/, int /*y*/, Nz::Mouse::Button button) override;
+			void OnMouseButtonRelease(int /*x*/, int /*y*/, Nz::Mouse::Button button) override;
+			void OnMouseEnter() override;
+			void OnMouseMoved(int x, int y, int deltaX, int deltaY) override;
+			void OnTextEntered(char32_t character, bool repeated) override;
+
+			inline void SetCursorPositionInternal(std::size_t glyphIndex);
+			inline void SetCursorPositionInternal(Nz::Vector2ui cursorPosition);
+
+			void RefreshCursor();
+			virtual void UpdateDisplayText() = 0;
+			void UpdateTextSprite();
+
+			CharacterFilter m_characterFilter;
+			EchoMode m_echoMode;
+			EntityHandle m_cursorEntity;
+			EntityHandle m_textEntity;
+			Nz::TextSpriteRef m_textSprite;
+			Nz::Vector2ui m_cursorPositionBegin;
+			Nz::Vector2ui m_cursorPositionEnd;
+			Nz::Vector2ui m_selectionCursor;
+			std::vector<Nz::SpriteRef> m_cursorSprites;
+			bool m_isLineWrapEnabled;
+			bool m_isMouseButtonDown;
+			bool m_multiLineEnabled;
+			bool m_readOnly;
+			bool m_tabEnabled; // writes (Shift+)Tab character if set to true
+	};
+}
+
+#include <NDK/Widgets/AbstractTextAreaWidget.inl>
+
+#endif // NDK_WIDGETS_ABSTRACTTEXTAREAWIDGET_HPP

SDK/include/NDK/Widgets/AbstractTextAreaWidget.inl

@@ -0,0 +1,252 @@
+// Copyright (C) 2017 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequisites.hpp
+
+#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
+
+namespace Ndk
+{
+	inline void AbstractTextAreaWidget::EnableMultiline(bool enable)
+	{
+		m_multiLineEnabled = enable;
+	}
+
+	inline void AbstractTextAreaWidget::EnableTabWriting(bool enable)
+	{
+		m_tabEnabled = enable;
+	}
+
+	inline void AbstractTextAreaWidget::Erase(std::size_t glyphPosition)
+	{
+		Erase(glyphPosition, glyphPosition + 1U);
+	}
+
+	inline void AbstractTextAreaWidget::EraseSelection()
+	{
+		if (!HasSelection())
+			return;
+
+		Erase(GetGlyphIndex(m_cursorPositionBegin), GetGlyphIndex(m_cursorPositionEnd));
+	}
+
+	inline const AbstractTextAreaWidget::CharacterFilter& AbstractTextAreaWidget::GetCharacterFilter() const
+	{
+		return m_characterFilter;
+	}
+
+	inline const Nz::Vector2ui& AbstractTextAreaWidget::GetCursorPosition() const
+	{
+		return m_cursorPositionBegin;
+	}
+
+	Nz::Vector2ui AbstractTextAreaWidget::GetCursorPosition(std::size_t glyphIndex) const
+	{
+		const Nz::AbstractTextDrawer& textDrawer = GetTextDrawer();
+
+		glyphIndex = std::min(glyphIndex, GetTextDrawer().GetGlyphCount());
+
+		std::size_t lineCount = textDrawer.GetLineCount();
+		std::size_t line = 0U;
+		for (std::size_t i = line + 1; i < lineCount; ++i)
+		{
+			if (textDrawer.GetLine(i).glyphIndex > glyphIndex)
+				break;
+
+			line = i;
+		}
+
+		const auto& lineInfo = textDrawer.GetLine(line);
+
+		Nz::Vector2ui cursorPos;
+		cursorPos.y = static_cast<unsigned int>(line);
+		cursorPos.x = static_cast<unsigned int>(glyphIndex - lineInfo.glyphIndex);
+
+		return cursorPos;
+	}
+
+	inline EchoMode AbstractTextAreaWidget::GetEchoMode() const
+	{
+		return m_echoMode;
+	}
+
+	inline std::size_t AbstractTextAreaWidget::GetGlyphIndex() const
+	{
+		return GetGlyphIndex(m_cursorPositionBegin);
+	}
+
+	inline std::size_t AbstractTextAreaWidget::GetGlyphIndex(const Nz::Vector2ui& cursorPosition) const
+	{
+		const Nz::AbstractTextDrawer& textDrawer = GetTextDrawer();
+
+		std::size_t glyphIndex = textDrawer.GetLine(cursorPosition.y).glyphIndex + cursorPosition.x;
+		if (textDrawer.GetLineCount() > cursorPosition.y + 1)
+			glyphIndex = std::min(glyphIndex, textDrawer.GetLine(cursorPosition.y + 1).glyphIndex - 1);
+		else
+			glyphIndex = std::min(glyphIndex, textDrawer.GetGlyphCount());
+
+		return glyphIndex;
+	}
+
+	inline bool AbstractTextAreaWidget::HasSelection() const
+	{
+		return m_cursorPositionBegin != m_cursorPositionEnd;
+	}
+
+	inline bool AbstractTextAreaWidget::IsLineWrapEnabled() const
+	{
+		return m_isLineWrapEnabled;
+	}
+
+	inline bool AbstractTextAreaWidget::IsMultilineEnabled() const
+	{
+		return m_multiLineEnabled;
+	}
+
+	inline bool AbstractTextAreaWidget::IsTabWritingEnabled() const
+	{
+		return m_tabEnabled;
+	}
+
+	inline bool AbstractTextAreaWidget::IsReadOnly() const
+	{
+		return m_readOnly;
+	}
+
+	inline void AbstractTextAreaWidget::MoveCursor(int offset)
+	{
+		std::size_t cursorGlyph = GetGlyphIndex(m_cursorPositionBegin);
+		if (offset >= 0)
+			SetCursorPosition(cursorGlyph + static_cast<std::size_t>(offset));
+		else
+		{
+			std::size_t nOffset = static_cast<std::size_t>(-offset);
+			if (nOffset >= cursorGlyph)
+				SetCursorPosition(0);
+			else
+				SetCursorPosition(cursorGlyph - nOffset);
+		}
+	}
+
+	inline void AbstractTextAreaWidget::MoveCursor(const Nz::Vector2i& offset)
+	{
+		auto ClampOffset = [] (unsigned int cursorPosition, int cursorOffset) -> unsigned int
+		{
+			if (cursorOffset >= 0)
+				return cursorPosition + cursorOffset;
+			else
+			{
+				unsigned int nOffset = static_cast<unsigned int>(-cursorOffset);
+				if (nOffset >= cursorPosition)
+					return 0;
+				else
+					return cursorPosition - nOffset;
+			}
+		};
+
+		Nz::Vector2ui cursorPosition = m_cursorPositionBegin;
+		cursorPosition.x = ClampOffset(static_cast<unsigned int>(cursorPosition.x), offset.x);
+		cursorPosition.y = ClampOffset(static_cast<unsigned int>(cursorPosition.y), offset.y);
+
+		SetCursorPosition(cursorPosition);
+	}
+
+	inline Nz::Vector2ui AbstractTextAreaWidget::NormalizeCursorPosition(Nz::Vector2ui cursorPosition) const
+	{
+		const Nz::AbstractTextDrawer& textDrawer = GetTextDrawer();
+
+		std::size_t lineCount = textDrawer.GetLineCount();
+		if (cursorPosition.y >= lineCount)
+			cursorPosition.y = static_cast<unsigned int>(lineCount - 1);
+
+		const auto& lineInfo = textDrawer.GetLine(cursorPosition.y);
+		if (cursorPosition.y + 1 < lineCount)
+		{
+			const auto& nextLineInfo = textDrawer.GetLine(cursorPosition.y + 1);
+			cursorPosition.x = std::min(cursorPosition.x, static_cast<unsigned int>(nextLineInfo.glyphIndex - lineInfo.glyphIndex - 1));
+		}
+
+		return cursorPosition;
+	}
+
+	inline void AbstractTextAreaWidget::SetCharacterFilter(CharacterFilter filter)
+	{
+		m_characterFilter = std::move(filter);
+	}
+
+	inline void AbstractTextAreaWidget::SetCursorPosition(std::size_t glyphIndex)
+	{
+		Nz::Vector2ui position = GetCursorPosition(glyphIndex);
+		Nz::Vector2ui newPosition = position;
+
+		OnTextAreaCursorMove(this, &newPosition);
+
+		if (position == newPosition)
+			SetCursorPositionInternal(position);
+		else
+			SetCursorPositionInternal(GetGlyphIndex(newPosition));
+	}
+
+	inline void AbstractTextAreaWidget::SetCursorPosition(Nz::Vector2ui cursorPosition)
+	{
+		OnTextAreaCursorMove(this, &cursorPosition);
+
+		return SetCursorPositionInternal(NormalizeCursorPosition(cursorPosition));
+	}
+
+	inline void AbstractTextAreaWidget::SetEchoMode(EchoMode echoMode)
+	{
+		m_echoMode = echoMode;
+
+		UpdateDisplayText();
+	}
+
+	inline void AbstractTextAreaWidget::SetReadOnly(bool readOnly)
+	{
+		m_readOnly = readOnly;
+		m_cursorEntity->Enable(!m_readOnly && HasFocus());
+	}
+
+	inline void AbstractTextAreaWidget::SetSelection(Nz::Vector2ui fromPosition, Nz::Vector2ui toPosition)
+	{
+		// Ensure begin is before end
+		if (toPosition.y < fromPosition.y || (toPosition.y == fromPosition.y && toPosition.x < fromPosition.x))
+			std::swap(fromPosition, toPosition);
+
+		if (m_cursorPositionBegin != fromPosition || m_cursorPositionEnd != toPosition)
+		{
+			OnTextAreaSelection(this, &fromPosition, &toPosition);
+
+			// Ensure begin is before end a second time (in case signal changed it)
+			if (toPosition.y < fromPosition.y || (toPosition.y == fromPosition.y && toPosition.x < fromPosition.x))
+				std::swap(fromPosition, toPosition);
+
+			m_cursorPositionBegin = NormalizeCursorPosition(fromPosition);
+			m_cursorPositionEnd = NormalizeCursorPosition(toPosition);
+
+			RefreshCursor();
+		}
+	}
+
+	inline void AbstractTextAreaWidget::Write(const Nz::String& text)
+	{
+		Write(text, GetGlyphIndex(m_cursorPositionBegin));
+	}
+
+	inline void AbstractTextAreaWidget::Write(const Nz::String& text, const Nz::Vector2ui& glyphPosition)
+	{
+		Write(text, GetGlyphIndex(glyphPosition));
+	}
+
+	void AbstractTextAreaWidget::SetCursorPositionInternal(std::size_t glyphIndex)
+	{
+		return SetCursorPositionInternal(GetCursorPosition(glyphIndex));
+	}
+
+	inline void AbstractTextAreaWidget::SetCursorPositionInternal(Nz::Vector2ui cursorPosition)
+	{
+		m_cursorPositionBegin = cursorPosition;
+		m_cursorPositionEnd = m_cursorPositionBegin;
+
+		RefreshCursor();
+	}
+}

SDK/include/NDK/Widgets/RichTextAreaWidget.hpp

@@ -0,0 +1,58 @@
+// Copyright (C) 2017 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequisites.hpp
+
+#pragma once
+
+#ifndef NDK_WIDGETS_RICHTEXTAREAWIDGET_HPP
+#define NDK_WIDGETS_RICHTEXTAREAWIDGET_HPP
+
+#include <Nazara/Utility/RichTextDrawer.hpp>
+#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
+
+namespace Ndk
+{
+	class NDK_API RichTextAreaWidget : public AbstractTextAreaWidget
+	{
+		public:
+			RichTextAreaWidget(BaseWidget* parent);
+			RichTextAreaWidget(const RichTextAreaWidget&) = delete;
+			RichTextAreaWidget(RichTextAreaWidget&&) = default;
+			~RichTextAreaWidget() = default;
+
+			void AppendText(const Nz::String& text);
+
+			void Clear() override;
+
+			void Erase(std::size_t firstGlyph, std::size_t lastGlyph) override;
+
+			inline unsigned int GetCharacterSize() const;
+			inline const Nz::Color& GetTextColor() const;
+			inline Nz::Font* GetTextFont() const;
+
+			inline void SetCharacterSize(unsigned int characterSize);
+			inline void SetTextColor(const Nz::Color& color);
+			inline void SetTextFont(Nz::FontRef font);
+
+			void Write(const Nz::String& text, std::size_t glyphPosition) override;
+
+			RichTextAreaWidget& operator=(const RichTextAreaWidget&) = delete;
+			RichTextAreaWidget& operator=(RichTextAreaWidget&&) = default;
+
+		private:
+			Nz::AbstractTextDrawer& GetTextDrawer() override;
+			const Nz::AbstractTextDrawer& GetTextDrawer() const override;
+
+			void HandleIndentation(bool add) override;
+			void HandleSelectionIndentation(bool add) override;
+			void HandleWordCursorMove(bool left) override;
+
+			void UpdateDisplayText();
+
+			Nz::RichTextDrawer m_drawer;
+	};
+}
+
+#include <NDK/Widgets/RichTextAreaWidget.inl>
+
+#endif // NDK_WIDGETS_TEXTAREAWIDGET_HPP

SDK/include/NDK/Widgets/RichTextAreaWidget.inl

@@ -0,0 +1,38 @@
+// Copyright (C) 2017 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequisites.hpp
+
+#include <NDK/Widgets/RichTextAreaWidget.hpp>
+
+namespace Ndk
+{
+	inline unsigned int RichTextAreaWidget::GetCharacterSize() const
+	{
+		return m_drawer.GetDefaultCharacterSize();
+	}
+
+	inline const Nz::Color& RichTextAreaWidget::GetTextColor() const
+	{
+		return m_drawer.GetDefaultColor();
+	}
+
+	inline Nz::Font* RichTextAreaWidget::GetTextFont() const
+	{
+		return m_drawer.GetDefaultFont();
+	}
+
+	inline void RichTextAreaWidget::SetCharacterSize(unsigned int characterSize)
+	{
+		m_drawer.SetDefaultCharacterSize(characterSize);
+	}
+
+	inline void RichTextAreaWidget::SetTextColor(const Nz::Color& color)
+	{
+		m_drawer.SetDefaultColor(color);
+	}
+
+	inline void RichTextAreaWidget::SetTextFont(Nz::FontRef font)
+	{
+		m_drawer.SetDefaultFont(std::move(font));
+	}
+}

SDK/include/NDK/Widgets/TextAreaWidget.hpp

@@ -7,20 +7,14 @@
 #ifndef NDK_WIDGETS_TEXTAREAWIDGET_HPP
 #define NDK_WIDGETS_TEXTAREAWIDGET_HPP
 
-#include <Nazara/Graphics/TextSprite.hpp>
 #include <Nazara/Utility/SimpleTextDrawer.hpp>
-#include <NDK/BaseWidget.hpp>
-#include <NDK/Widgets/Enums.hpp>
-#include <functional>
-#include <vector>
+#include <NDK/Widgets/AbstractTextAreaWidget.hpp>
 
 namespace Ndk
 {
-	class NDK_API TextAreaWidget : public BaseWidget
+	class NDK_API TextAreaWidget : public AbstractTextAreaWidget
 	{
 		public:
-			using CharacterFilter = std::function<bool(char32_t)>;
-
 			TextAreaWidget(BaseWidget* parent);
 			TextAreaWidget(const TextAreaWidget&) = delete;
 			TextAreaWidget(TextAreaWidget&&) = default;
@@ -28,115 +22,46 @@ namespace Ndk
 
 			void AppendText(const Nz::String& text);
 
-			inline void Clear();
+			void Clear() override;
 
-			//virtual TextAreaWidget* Clone() const = 0;
+			using AbstractTextAreaWidget::Erase;
+			void Erase(std::size_t firstGlyph, std::size_t lastGlyph) override;
 
-			void EnableLineWrap(bool enable = true);
-			inline void EnableMultiline(bool enable = true);
-			inline void EnableTabWriting(bool enable = true);
-
-			inline void Erase(std::size_t glyphPosition);
-			void Erase(std::size_t firstGlyph, std::size_t lastGlyph);
-			void EraseSelection();
-
-			inline const CharacterFilter& GetCharacterFilter() const;
 			inline unsigned int GetCharacterSize() const;
-			inline const Nz::Vector2ui& GetCursorPosition() const;
-			inline Nz::Vector2ui GetCursorPosition(std::size_t glyphIndex) const;
 			inline const Nz::String& GetDisplayText() const;
-			inline EchoMode GetEchoMode() const;
-			inline std::size_t GetGlyphIndex() const;
-			inline std::size_t GetGlyphIndex(const Nz::Vector2ui& cursorPosition) const;
 			inline const Nz::String& GetText() const;
 			inline const Nz::Color& GetTextColor() const;
 			inline Nz::Font* GetTextFont() const;
 			inline const Nz::Color& GetTextOulineColor() const;
 			inline float GetTextOulineThickness() const;
 
-			Nz::Vector2ui GetHoveredGlyph(float x, float y) const;
-
-			inline bool HasSelection() const;
-
-			inline bool IsLineWrapEnabled() const;
-			inline bool IsMultilineEnabled() const;
-			inline bool IsReadOnly() const;
-			inline bool IsTabWritingEnabled() const;
-
-			inline void MoveCursor(int offset);
-			inline void MoveCursor(const Nz::Vector2i& offset);
-
-			inline Nz::Vector2ui NormalizeCursorPosition(Nz::Vector2ui cursorPosition) const;
-
-			inline void SetCharacterFilter(CharacterFilter filter);
 			void SetCharacterSize(unsigned int characterSize);
-			inline void SetCursorPosition(std::size_t glyphIndex);
-			inline void SetCursorPosition(Nz::Vector2ui cursorPosition);
-			inline void SetEchoMode(EchoMode echoMode);
-			inline void SetReadOnly(bool readOnly = true);
-			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 SetTextFont(Nz::FontRef font);
 			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);
-			void Write(const Nz::String& text, std::size_t glyphPosition);
+			using AbstractTextAreaWidget::Write;
+			void Write(const Nz::String& text, std::size_t glyphPosition) override;
 
 			TextAreaWidget& operator=(const TextAreaWidget&) = delete;
 			TextAreaWidget& operator=(TextAreaWidget&&) = default;
 
-			NazaraSignal(OnTextAreaCursorMove, const TextAreaWidget* /*textArea*/, Nz::Vector2ui* /*newCursorPosition*/);
-			NazaraSignal(OnTextAreaKeyBackspace, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaKeyDown, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaKeyEnd, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaKeyHome, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaKeyLeft, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaKeyReturn, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaKeyRight, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaKeyUp, const TextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);
-			NazaraSignal(OnTextAreaSelection, const TextAreaWidget* /*textArea*/, Nz::Vector2ui* /*start*/, Nz::Vector2ui* /*end*/);
-			NazaraSignal(OnTextChanged, const TextAreaWidget* /*textArea*/, const Nz::String& /*text*/);
+			NazaraSignal(OnTextChanged, const AbstractTextAreaWidget* /*textArea*/, const Nz::String& /*text*/);
 
 		private:
-			void Layout() override;
+			Nz::AbstractTextDrawer& GetTextDrawer() override;
+			const Nz::AbstractTextDrawer& GetTextDrawer() const override;
 
-			bool IsFocusable() const override;
-			void OnFocusLost() override;
-			void OnFocusReceived() override;
-			bool OnKeyPressed(const Nz::WindowEvent::KeyEvent& key) override;
-			void OnKeyReleased(const Nz::WindowEvent::KeyEvent& key) override;
-			void OnMouseButtonPress(int /*x*/, int /*y*/, Nz::Mouse::Button button) override;
-			void OnMouseButtonRelease(int /*x*/, int /*y*/, Nz::Mouse::Button button) override;
-			void OnMouseEnter() override;
-			void OnMouseMoved(int x, int y, int deltaX, int deltaY) override;
-			void OnTextEntered(char32_t character, bool repeated) override;
+			void HandleIndentation(bool add) override;
+			void HandleSelectionIndentation(bool add) override;
+			void HandleWordCursorMove(bool left) override;
 
-			inline void SetCursorPositionInternal(std::size_t glyphIndex);
-			inline void SetCursorPositionInternal(Nz::Vector2ui cursorPosition);
-
-			void RefreshCursor();
 			void UpdateDisplayText();
-			void UpdateTextSprite();
 
-			CharacterFilter m_characterFilter;
-			EchoMode m_echoMode;
-			EntityHandle m_cursorEntity;
-			EntityHandle m_textEntity;
 			Nz::SimpleTextDrawer m_drawer;
 			Nz::String m_text;
-			Nz::TextSpriteRef m_textSprite;
-			Nz::Vector2ui m_cursorPositionBegin;
-			Nz::Vector2ui m_cursorPositionEnd;
-			Nz::Vector2ui m_selectionCursor;
-			std::vector<Nz::SpriteRef> m_cursorSprites;
-			bool m_isLineWrapEnabled;
-			bool m_isMouseButtonDown;
-			bool m_multiLineEnabled;
-			bool m_readOnly;
-			bool m_tabEnabled; // writes (Shift+)Tab character if set to true
 	};
 }
 

SDK/include/NDK/Widgets/TextAreaWidget.inl

@@ -6,98 +6,16 @@
 
 namespace Ndk
 {
-	inline void TextAreaWidget::Clear()
-	{
-		m_cursorPositionBegin.MakeZero();
-		m_cursorPositionEnd.MakeZero();
-		m_drawer.Clear();
-		m_text.Clear();
-		m_textSprite->Update(m_drawer);
-		SetPreferredSize(Nz::Vector2f(m_textSprite->GetBoundingVolume().obb.localBox.GetLengths()));
-
-		RefreshCursor();
-		OnTextChanged(this, m_text);
-	}
-
-	inline void TextAreaWidget::EnableMultiline(bool enable)
-	{
-		m_multiLineEnabled = enable;
-	}
-
-	inline void TextAreaWidget::EnableTabWriting(bool enable)
-	{
-		m_tabEnabled = enable;
-	}
-
-	inline void TextAreaWidget::Erase(std::size_t glyphPosition)
-	{
-		Erase(glyphPosition, glyphPosition + 1U);
-	}
-
-	inline const TextAreaWidget::CharacterFilter& TextAreaWidget::GetCharacterFilter() const
-	{
-		return m_characterFilter;
-	}
-
 	inline unsigned int TextAreaWidget::GetCharacterSize() const
 	{
 		return m_drawer.GetCharacterSize();
 	}
 
-	inline const Nz::Vector2ui& TextAreaWidget::GetCursorPosition() const
-	{
-		return m_cursorPositionBegin;
-	}
-
-	Nz::Vector2ui TextAreaWidget::GetCursorPosition(std::size_t glyphIndex) const
-	{
-		glyphIndex = std::min(glyphIndex, m_drawer.GetGlyphCount());
-
-		std::size_t lineCount = m_drawer.GetLineCount();
-		std::size_t line = 0U;
-		for (std::size_t i = line + 1; i < lineCount; ++i)
-		{
-			if (m_drawer.GetLine(i).glyphIndex > glyphIndex)
-				break;
-
-			line = i;
-		}
-
-		const auto& lineInfo = m_drawer.GetLine(line);
-
-		Nz::Vector2ui cursorPos;
-		cursorPos.y = static_cast<unsigned int>(line);
-		cursorPos.x = static_cast<unsigned int>(glyphIndex - lineInfo.glyphIndex);
-
-		return cursorPos;
-	}
-
 	inline const Nz::String& TextAreaWidget::GetDisplayText() const
 	{
 		return m_drawer.GetText();
 	}
 
-	inline EchoMode TextAreaWidget::GetEchoMode() const
-	{
-		return m_echoMode;
-	}
-
-	inline std::size_t TextAreaWidget::GetGlyphIndex() const
-	{
-		return GetGlyphIndex(m_cursorPositionBegin);
-	}
-
-	inline std::size_t TextAreaWidget::GetGlyphIndex(const Nz::Vector2ui& cursorPosition) const
-	{
-		std::size_t glyphIndex = m_drawer.GetLine(cursorPosition.y).glyphIndex + cursorPosition.x;
-		if (m_drawer.GetLineCount() > cursorPosition.y + 1)
-			glyphIndex = std::min(glyphIndex, m_drawer.GetLine(cursorPosition.y + 1).glyphIndex - 1);
-		else
-			glyphIndex = std::min(glyphIndex, m_drawer.GetGlyphCount());
-
-		return glyphIndex;
-	}
-
 	inline const Nz::String& TextAreaWidget::GetText() const
 	{
 		return m_text;
@@ -123,144 +41,6 @@ namespace Ndk
 		return m_drawer.GetOutlineThickness();
 	}
 
-	inline bool TextAreaWidget::HasSelection() const
-	{
-		return m_cursorPositionBegin != m_cursorPositionEnd;
-	}
-
-	inline bool TextAreaWidget::IsLineWrapEnabled() const
-	{
-		return m_isLineWrapEnabled;
-	}
-
-	inline bool TextAreaWidget::IsMultilineEnabled() const
-	{
-		return m_multiLineEnabled;
-	}
-
-	inline bool TextAreaWidget::IsTabWritingEnabled() const
-	{
-		return m_tabEnabled;
-	}
-
-	inline bool TextAreaWidget::IsReadOnly() const
-	{
-		return m_readOnly;
-	}
-
-	inline void TextAreaWidget::MoveCursor(int offset)
-	{
-		std::size_t cursorGlyph = GetGlyphIndex(m_cursorPositionBegin);
-		if (offset >= 0)
-			SetCursorPosition(cursorGlyph + static_cast<std::size_t>(offset));
-		else
-		{
-			std::size_t nOffset = static_cast<std::size_t>(-offset);
-			if (nOffset >= cursorGlyph)
-				SetCursorPosition(0);
-			else
-				SetCursorPosition(cursorGlyph - nOffset);
-		}
-	}
-
-	inline void TextAreaWidget::MoveCursor(const Nz::Vector2i& offset)
-	{
-		auto ClampOffset = [] (unsigned int cursorPosition, int cursorOffset) -> unsigned int
-		{
-			if (cursorOffset >= 0)
-				return cursorPosition + cursorOffset;
-			else
-			{
-				unsigned int nOffset = static_cast<unsigned int>(-cursorOffset);
-				if (nOffset >= cursorPosition)
-					return 0;
-				else
-					return cursorPosition - nOffset;
-			}
-		};
-
-		Nz::Vector2ui cursorPosition = m_cursorPositionBegin;
-		cursorPosition.x = ClampOffset(static_cast<unsigned int>(cursorPosition.x), offset.x);
-		cursorPosition.y = ClampOffset(static_cast<unsigned int>(cursorPosition.y), offset.y);
-
-		SetCursorPosition(cursorPosition);
-	}
-
-	inline Nz::Vector2ui TextAreaWidget::NormalizeCursorPosition(Nz::Vector2ui cursorPosition) const
-	{
-		std::size_t lineCount = m_drawer.GetLineCount();
-		if (cursorPosition.y >= lineCount)
-			cursorPosition.y = static_cast<unsigned int>(lineCount - 1);
-
-		const auto& lineInfo = m_drawer.GetLine(cursorPosition.y);
-		if (cursorPosition.y + 1 < lineCount)
-		{
-			const auto& nextLineInfo = m_drawer.GetLine(cursorPosition.y + 1);
-			cursorPosition.x = std::min(cursorPosition.x, static_cast<unsigned int>(nextLineInfo.glyphIndex - lineInfo.glyphIndex - 1));
-		}
-
-		return cursorPosition;
-	}
-
-	inline void TextAreaWidget::SetCharacterFilter(CharacterFilter filter)
-	{
-		m_characterFilter = std::move(filter);
-	}
-
-	inline void TextAreaWidget::SetCursorPosition(std::size_t glyphIndex)
-	{
-		Nz::Vector2ui position = GetCursorPosition(glyphIndex);
-		Nz::Vector2ui newPosition = position;
-
-		OnTextAreaCursorMove(this, &newPosition);
-
-		if (position == newPosition)
-			SetCursorPositionInternal(position);
-		else
-			SetCursorPositionInternal(GetGlyphIndex(newPosition));
-	}
-
-	inline void TextAreaWidget::SetCursorPosition(Nz::Vector2ui cursorPosition)
-	{
-		OnTextAreaCursorMove(this, &cursorPosition);
-
-		return SetCursorPositionInternal(NormalizeCursorPosition(cursorPosition));
-	}
-
-	inline void TextAreaWidget::SetEchoMode(EchoMode echoMode)
-	{
-		m_echoMode = echoMode;
-
-		UpdateDisplayText();
-	}
-
-	inline void TextAreaWidget::SetReadOnly(bool readOnly)
-	{
-		m_readOnly = readOnly;
-		m_cursorEntity->Enable(!m_readOnly && HasFocus());
-	}
-
-	inline void TextAreaWidget::SetSelection(Nz::Vector2ui fromPosition, Nz::Vector2ui toPosition)
-	{
-		// Ensure begin is before end
-		if (toPosition.y < fromPosition.y || (toPosition.y == fromPosition.y && toPosition.x < fromPosition.x))
-			std::swap(fromPosition, toPosition);
-
-		if (m_cursorPositionBegin != fromPosition || m_cursorPositionEnd != toPosition)
-		{
-			OnTextAreaSelection(this, &fromPosition, &toPosition);
-
-			// Ensure begin is before end a second time (in case signal changed it)
-			if (toPosition.y < fromPosition.y || (toPosition.y == fromPosition.y && toPosition.x < fromPosition.x))
-				std::swap(fromPosition, toPosition);
-
-			m_cursorPositionBegin = NormalizeCursorPosition(fromPosition);
-			m_cursorPositionEnd = NormalizeCursorPosition(toPosition);
-
-			RefreshCursor();
-		}
-	}
-
 	inline void TextAreaWidget::SetText(const Nz::String& text)
 	{
 		m_text = text;
@@ -296,27 +76,4 @@ namespace Ndk
 
 		UpdateDisplayText();
 	}
-
-	inline void TextAreaWidget::Write(const Nz::String& text)
-	{
-		Write(text, GetGlyphIndex(m_cursorPositionBegin));
-	}
-
-	inline void TextAreaWidget::Write(const Nz::String& text, const Nz::Vector2ui& glyphPosition)
-	{
-		Write(text, GetGlyphIndex(glyphPosition));
-	}
-
-	void TextAreaWidget::SetCursorPositionInternal(std::size_t glyphIndex)
-	{
-		return SetCursorPositionInternal(GetCursorPosition(glyphIndex));
-	}
-
-	inline void TextAreaWidget::SetCursorPositionInternal(Nz::Vector2ui cursorPosition)
-	{
-		m_cursorPositionBegin = cursorPosition;
-		m_cursorPositionEnd = m_cursorPositionBegin;
-
-		RefreshCursor();
-	}
 }