Update UITextBox & key event

skylicht-lab · Aug 14, 2024 · 34fe3f3 · 34fe3f3
1 parent 153c8e3
commit 34fe3f3
Show file tree

Hide file tree

Showing 11 changed files with 639 additions and 88 deletions.
diff --git a/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIText.cpp b/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIText.cpp
diff --git a/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIText.h b/Projects/Skylicht/Engine/Source/Graphics2D/GUI/CGUIText.h
@@ -54,6 +54,8 @@ namespace Skylicht
 		std::wstring m_textw;
 		ArrayInt m_textFormat;
 
+		bool m_enableTextFormat;
+
 		std::string m_textId;
 		std::wstring m_textwId;
 
@@ -73,6 +75,7 @@ namespace Skylicht
 
 		std::vector<ArrayModuleOffset> m_arrayCharRender;
 		std::vector<ArrayInt> m_arrayCharFormat;
+		std::vector<ArrayInt> m_arrayCharId;
 
 		std::string m_fontSource;
 		std::string m_fontGUID;
@@ -86,6 +89,7 @@ namespace Skylicht
 #ifdef HAVE_CARET
 		bool m_showCaret;
 		int m_caretShader;
+		int m_setCaret;
 		float m_caretBlink;
 		float m_caretBlinkSpeed;
 		core::vector2di m_caret;
@@ -104,8 +108,6 @@ namespace Skylicht
 
 		virtual void render(CCamera* camera);
 
-		void splitText(std::vector<ArrayModuleOffset>& split, std::vector<ArrayInt>& format, int width);
-
 		void setTextAlign(EGUIHorizontalAlign h, EGUIVerticalAlign v)
 		{
 			TextVertical = v;
@@ -114,7 +116,7 @@ namespace Skylicht
 
 		/*
 		* Example:
-		* <1>PLAYERA <0>kill <1>PLAYERB <0>with <2>AK47
+		* <1>PLAYERA <0>gives <2>a heart <0>to <1>PLAYERB
 		* With format:
 		* <1> -> RED
 		* <0> -> WHITE
@@ -161,6 +163,16 @@ namespace Skylicht
 			return m_textwId.c_str();
 		}
 
+		inline void setEnableTextFormnat(bool b)
+		{
+			m_enableTextFormat = b;
+		}
+
+		inline bool isEnableTextFormat()
+		{
+			return m_enableTextFormat;
+		}
+
 		inline void setCharPadding(int charPadding)
 		{
 			m_charPadding = charPadding;
@@ -193,8 +205,6 @@ namespace Skylicht
 		void getClosestCharacter(float posX, float posY, int& line, int& character);
 
 #ifdef HAVE_CARET
-		void updateCaret();
-
 		inline void showCaret(bool b)
 		{
 			m_showCaret = b;
@@ -205,10 +215,45 @@ namespace Skylicht
 			m_caret.set(character, line);
 			m_caretBlink = 0.0f;
 		}
+
+		void setCaret(int charPos);
+
+		inline void getCaretPosition(int& line, int& character)
+		{
+			character = m_caret.X;
+			line = m_caret.Y;
+		}
+
+		inline int getNumLine()
+		{
+			return (int)m_arrayCharRender.size();
+		}
+
+		int getNumCharacter(int line);
+
+		bool getWordAtPosition(int line, int charPosition, int& from, int& to);
+
+		bool isCharacter(wchar_t c);
+
+		void doBackspace();
+
+		void doDelete();
+
+		void insert(wchar_t c);
 #endif
 
 	protected:
 
+#ifdef HAVE_CARET
+		void updateCaret();
+
+		void updateSetCaret();
+#endif
+
+		void updateSplitText();
+
+		void splitText(std::vector<ArrayModuleOffset>& split, std::vector<ArrayInt>& format, std::vector<ArrayInt>& id, int width);
+
 		void getClosestCharacter(float posX, int x, int y, int line, const core::matrix4& world, int& character);
 
 		void initFont(IFont* font);

diff --git a/Projects/Skylicht/Engine/Source/Graphics2D/SpriteFrame/CSpriteFrame.cpp b/Projects/Skylicht/Engine/Source/Graphics2D/SpriteFrame/CSpriteFrame.cpp
@@ -31,18 +31,17 @@ This file is part of the "Skylicht Engine".
 
 namespace Skylicht
 {
-	SModuleOffset::SModuleOffset()
+	SModuleOffset::SModuleOffset() :
+		OffsetX(0),
+		OffsetY(0),
+		FlipX(false),
+		FlipY(false),
+		XAdvance(0.0f),
+		Character(0),
+		Frame(NULL),
+		Module(NULL)
 	{
-		OffsetX = 0;
-		OffsetY = 0;
-		FlipX = false;
-		FlipY = false;
 
-		XAdvance = 0.0f;
-		Character = 0;
-
-		Frame = NULL;
-		Module = NULL;
 	}
 
 	void SModuleOffset::getPositionBuffer(video::S3DVertex* vertices, u16* indices, int vertexOffset, const core::matrix4& mat, float scaleW, float scaleH)

diff --git a/Projects/Skylicht/UserInterface/Source/Motion/CMotion.h b/Projects/Skylicht/UserInterface/Source/Motion/CMotion.h
@@ -40,6 +40,8 @@ namespace Skylicht
 			PointerOut,
 			PointerDown,
 			PointerUp,
+			Focus,
+			UnFocus,
 			NumEvent
 		};
 

diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIBase.cpp b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIBase.cpp
@@ -37,7 +37,7 @@ namespace Skylicht
 			m_visible(true),
 			m_isPointerHover(false),
 			m_isPointerDown(false),
-			m_enableTouchScreen(false)
+			m_contineGameEvent(false)
 		{
 			m_container->addChild(this);
 		}
@@ -165,6 +165,12 @@ namespace Skylicht
 				OnLostFocus(this);
 		}
 
+		void CUIBase::onKeyEvent(const SEvent& event)
+		{
+			if (OnKeyEvent != nullptr)
+				OnKeyEvent(this, event);
+		}
+
 		void CUIBase::startMotion(EMotionEvent event)
 		{
 			if (!m_element)

diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIBase.h b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIBase.h
@@ -56,7 +56,7 @@ namespace Skylicht
 			bool m_isPointerHover;
 			bool m_isPointerDown;
 
-			bool m_enableTouchScreen;
+			bool m_contineGameEvent;
 
 		public:
 			std::function<void(float, float)> OnPointerHover;
@@ -67,6 +67,7 @@ namespace Skylicht
 			std::function<void(CUIBase*)> OnPressed;
 			std::function<void(CUIBase*)> OnFocus;
 			std::function<void(CUIBase*)> OnLostFocus;
+			std::function<void(CUIBase*, const SEvent&)> OnKeyEvent;
 
 		public:
 			CUIBase(CUIContainer* container, CGUIElement* element);
@@ -91,14 +92,14 @@ namespace Skylicht
 				return m_visible;
 			}
 
-			inline void setEnableTouchScreen(bool b)
+			inline void setContinueGameEvent(bool b)
 			{
-				m_enableTouchScreen = b;
+				m_contineGameEvent = b;
 			}
 
-			inline bool isEnableTouchScreen()
+			inline bool isContinueGameEvent()
 			{
-				return m_enableTouchScreen;
+				return m_contineGameEvent;
 			}
 
 			inline void setPointerHover(bool b)
@@ -156,6 +157,8 @@ namespace Skylicht
 
 			virtual void onLostFocus();
 
+			virtual void onKeyEvent(const SEvent& event);
+
 			void startMotion(EMotionEvent event);
 
 			bool isMotionPlaying(EMotionEvent event);

diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.cpp b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.cpp
@@ -73,6 +73,8 @@ namespace Skylicht
 
 				if (m_capture)
 				{
+					base = m_capture;
+
 					CUIContainer* captureContainer = m_capture->getContainer();
 					captureContainer->OnProcessEvent(event, m_capture);
 
@@ -81,8 +83,6 @@ namespace Skylicht
 						if (captureContainer != ui)
 							ui->onPointerOut(mouseX, mouseY);
 					}
-
-					base = m_capture;
 				}
 				else
 				{
@@ -105,7 +105,15 @@ namespace Skylicht
 				if (!base)
 					return true;
 				else
-					return base->isEnableTouchScreen();
+					return base->isContinueGameEvent();
+			}
+			else if (event.EventType == EET_KEY_INPUT_EVENT)
+			{
+				if (m_focus)
+				{
+					m_focus->onKeyEvent(event);
+					return m_focus->isContinueGameEvent();
+				}
 			}
 
 			return true;
@@ -144,11 +152,17 @@ namespace Skylicht
 				return;
 
 			if (m_focus && m_focus != focus)
+			{
 				m_focus->onLostFocus();
+				m_focus->startMotion(UI::EMotionEvent::UnFocus);
+			}
 
 			m_focus = focus;
 			if (m_focus)
+			{
 				m_focus->onFocus();
+				m_focus->startMotion(UI::EMotionEvent::Focus);
+			}
 		}
 	}
 }
diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.h b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.h
@@ -65,6 +65,10 @@ namespace Skylicht
 
 			void setFocus(CUIBase* focus);
 
+			inline CUIBase* getFocus()
+			{
+				return m_focus;
+			}
 		};
 	}
 }