Fix bug Editor (newGUI will save on old file)

skylicht-lab · Aug 22, 2024 · 239a6a3 · 239a6a3
1 parent 2561380
commit 239a6a3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 7 deletions.
diff --git a/Projects/Editor/Source/Editor/Space/GUIDesign/CSpaceGUIDesign.cpp b/Projects/Editor/Source/Editor/Space/GUIDesign/CSpaceGUIDesign.cpp
@@ -525,7 +525,9 @@ namespace Skylicht
 			canvas->removeAllElement();
 			m_gizmos->onRemove();
 
-			CGUIDesignController::getInstance()->rebuildGUIHierachy();
+			CGUIDesignController* controller = CGUIDesignController::getInstance();
+			controller->rebuildGUIHierachy();
+			controller->newGUI();
 			resetView(canvas);
 		}
 

diff --git a/Projects/Editor/Source/Editor/SpaceController/CGUIDesignController.cpp b/Projects/Editor/Source/Editor/SpaceController/CGUIDesignController.cpp
@@ -562,6 +562,11 @@ namespace Skylicht
 			}
 		}
 
+		void CGUIDesignController::newGUI()
+		{
+			m_guiFilePath = "";
+		}
+
 		bool CGUIDesignController::needSave()
 		{
 			return true;

diff --git a/Projects/Editor/Source/Editor/SpaceController/CGUIDesignController.h b/Projects/Editor/Source/Editor/SpaceController/CGUIDesignController.h
@@ -92,6 +92,8 @@ namespace Skylicht
 				return m_guiFilePath;
 			}
 
+			void newGUI();
+
 			bool needSave();
 
 			void save(const char* path);

diff --git a/Projects/Main/Platforms/Emscripten/Index.html b/Projects/Main/Platforms/Emscripten/Index.html
@@ -5,9 +5,12 @@
 	<title>Skylicht Engine</title>
 	<meta name="description" content="">
 	<style type="text/css">
-		body {
-			margin: 0 auto;
+		html,body {
+			margin: 0 !important;
+			padding: 0 !important;
 			background: #000000;
+			overflow: hidden;
+			display: block;
 		}
 	</style>
 </head>

diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.cpp b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.cpp
@@ -35,7 +35,9 @@ namespace Skylicht
 		CUIEventManager::CUIEventManager() :
 			m_pointerId(-1),
 			m_capture(NULL),
-			m_focus(NULL)
+			m_focus(NULL),
+			m_pointerX(0),
+			m_pointerY(0)
 		{
 			CEventManager::getInstance()->registerProcessorEvent("CUIEventManager", this);
 		}
@@ -52,6 +54,9 @@ namespace Skylicht
 				f32 mouseX = (f32)event.MouseInput.X;
 				f32 mouseY = (f32)event.MouseInput.Y;
 
+				m_pointerX = event.MouseInput.X;
+				m_pointerY = event.MouseInput.Y;
+
 				if (m_pointerId != -1 && event.MouseInput.ID != m_pointerId)
 					return true;
 

diff --git a/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.h b/Projects/Skylicht/UserInterface/Source/UserInterface/CUIEventManager.h
@@ -39,14 +39,16 @@ namespace Skylicht
 		public:
 			DECLARE_SINGLETON(CUIEventManager)
 
+		protected:
 			std::vector<CUIContainer*> m_containers;
 
-			int m_pointerId;
-
 			CUIBase* m_capture;
-
 			CUIBase* m_focus;
 
+			int m_pointerId;
+			int m_pointerX;
+			int m_pointerY;
+
 		public:
 			CUIEventManager();
 
@@ -69,6 +71,16 @@ namespace Skylicht
 			{
 				return m_focus;
 			}
+
+			inline int getPointerX()
+			{
+				return m_pointerX;
+			}
+
+			inline int getPointerY()
+			{
+				return m_pointerY;
+			}
 		};
 	}
 }