Merge branch 'master' into console-widget

2018-10-31 18:39:14 +01:00
parent 400e8e92aa
commit 1c0a234d04
4 changed files with 7 additions and 18 deletions
--- a/SDK/include/NDK/Console.hpp
+++ b/SDK/include/NDK/Console.hpp
@@ -49,8 +49,6 @@ namespace Ndk
 			inline const TextAreaWidget* GetInput() const;
 			inline const Nz::FontRef& GetTextFont() const;

-			void ResizeToContent() override;
-
 			void SetCharacterSize(unsigned int size);
 			void SetFocus();
 			void SetTextFont(Nz::FontRef font);
--- a/SDK/include/NDK/Widgets/TextAreaWidget.inl
+++ b/SDK/include/NDK/Widgets/TextAreaWidget.inl
@@ -83,7 +83,7 @@ namespace Ndk

 	inline std::size_t TextAreaWidget::GetGlyphIndex() const
 	{
-		return GetGlyphIndex(m_cursorPosition);
+		return GetGlyphIndex(m_cursorPositionBegin);
 	}

 	inline std::size_t TextAreaWidget::GetGlyphIndex(const Nz::Vector2ui& cursorPosition) const