update

meta4d-me · Nov 6, 2023 · bdff1ff · bdff1ff
1 parent 73b9071
commit bdff1ff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Engine/Source/Editor/EditorApp.cpp b/Engine/Source/Editor/EditorApp.cpp
@@ -187,7 +187,7 @@ void EditorApp::InitEditorUILayers()
 
 	auto pAssetBrowser = std::make_unique<AssetBrowser>("AssetBrowser");
 	pAssetBrowser->SetSceneRenderer(m_pSceneRenderer);
-	GetMainWindow()->OnDropFile.Bind<editor::AssetBrowser, &editor::AssetBrowser::ImportAssetFile>(pAssetBrowser.get());
+	OnDropFile.Bind<editor::AssetBrowser, &editor::AssetBrowser::ImportAssetFile>(pAssetBrowser.get());
 
 	m_pEditorImGuiContext->AddDynamicLayer(cd::MoveTemp(pAssetBrowser));
 	m_pEditorImGuiContext->AddDynamicLayer(std::make_unique<OutputLog>("OutputLog"));

diff --git a/Engine/Source/Editor/EditorApp.h b/Engine/Source/Editor/EditorApp.h
@@ -111,6 +111,9 @@ class EditorApp final : public engine::IApplication
 	engine::Renderer* m_pTerrainRenderer = nullptr;
 	engine::Renderer* m_pAABBRenderer = nullptr;
 
+	// Delegates
+	Delegate<void(const char*)> OnDropFile;
+
 	// Controllers for processing input events.
 	std::unique_ptr<engine::CameraController> m_pViewportCameraController;
 

diff --git a/Engine/Source/Runtime/Window/Window.h b/Engine/Source/Runtime/Window/Window.h
@@ -76,7 +76,6 @@ class Window
 
 public:
     // Delegates
-    Delegate<void(const char*)> OnDropFile;
     MulticastDelegate<void(uint16_t, uint16_t)> OnResize;
 
 private:

diff --git a/Engine/Source/Runtime/Window/WindowManager.cpp b/Engine/Source/Runtime/Window/WindowManager.cpp
@@ -219,7 +219,7 @@ void WindowManager::Update()
 
 		case SDL_DROPFILE:
 		{
-			GetActiveWindow()->OnDropFile.Invoke(sdlEvent.drop.file);
+			OnDropFile.Invoke(sdlEvent.drop.file);
 		}
 		break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -219,7 +219,7 @@ void WindowManager::Update() @@
     		case SDL_DROPFILE:
     		{
-    			GetActiveWindow()->OnDropFile.Invoke(sdlEvent.drop.file);
+    			OnDropFile.Invoke(sdlEvent.drop.file);
     		}
     		break;
@@ Expand Down @@