Update sample LuckyDraw use the UI Interface

skylicht-lab · Aug 19, 2024 · 7813d60 · 7813d60
1 parent 1a65425
commit 7813d60
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 572 deletions.
diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIBase.cpp b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIBase.cpp
@@ -48,7 +48,7 @@ namespace Skylicht
 		CUIBase::~CUIBase()
 		{
 			CUIEventManager* eventMgr = CUIEventManager::getInstance();
-			if (eventMgr->getFocus() == this)
+			if (eventMgr && eventMgr->getFocus() == this)
 				eventMgr->setFocus(NULL);
 
 			for (int i = 0, n = (int)EMotionEvent::NumEvent; i < n; i++)

diff --git a/Samples/LuckyDraw/CMakeLists.txt b/Samples/LuckyDraw/CMakeLists.txt
@@ -11,6 +11,7 @@ include_directories(
 	${SKYLICHT_ENGINE_PROJECT_DIR}/Skylicht/Client/Source
 	${SKYLICHT_ENGINE_PROJECT_DIR}/Skylicht/Lightmapper/Source
 	${SKYLICHT_ENGINE_PROJECT_DIR}/Skylicht/Audio/Source
+	${SKYLICHT_ENGINE_PROJECT_DIR}/Skylicht/UserInterface/Source
 	${SKYLICHT_ENGINE_PROJECT_DIR}/ThirdParty/source/freetype2/include
 )
 

diff --git a/Samples/LuckyDraw/Source/CButton.cpp b/Samples/LuckyDraw/Source/CButton.cpp
diff --git a/Samples/LuckyDraw/Source/CButton.h b/Samples/LuckyDraw/Source/CButton.h