Update UI

skylicht-lab · Sep 17, 2024 · b6683ef · b6683ef
1 parent 81fb2da
commit b6683ef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/Projects/Skylicht/UserInterface/UserInterface/CUIBase.cpp b/Projects/Skylicht/UserInterface/UserInterface/CUIBase.cpp
@@ -303,6 +303,12 @@ namespace Skylicht
 			motions.clear();
 		}
 
+		void CUIBase::resetPointer()
+		{
+			m_isPointerHover = false;
+			m_isPointerDown = false;
+		}
+
 		void CUIBase::convertToUICoordinate(float& pointerX, float& pointerY)
 		{
 			CCanvas* canvas = getCanvas();

diff --git a/Projects/Skylicht/UserInterface/UserInterface/CUIBase.h b/Projects/Skylicht/UserInterface/UserInterface/CUIBase.h
@@ -171,6 +171,8 @@ namespace Skylicht
 
 			virtual void onKeyEvent(const SEvent& event);
 
+			void resetPointer();
+
 			void startMotion(EMotionEvent event);
 
 			bool isMotionPlaying(EMotionEvent event);
@@ -188,6 +190,7 @@ namespace Skylicht
 			void convertWorldToLocal(CGUIElement* element, float& x, float& y);
 
 			void convertLocalToWorld(CGUIElement* element, float& x, float& y);
+
 		};
 	}
 }
diff --git a/Projects/Skylicht/UserInterface/UserInterface/CUIContainer.cpp b/Projects/Skylicht/UserInterface/UserInterface/CUIContainer.cpp
@@ -273,6 +273,13 @@ namespace Skylicht
 					}
 				}
 
+				if (!m_hover->isEnable())
+				{
+					// if call setEnable(false) on pointerEvent
+					m_hover->resetPointer();
+					m_hover = NULL;
+				}
+
 				// disable event
 				return m_hover;
 			}